diff options
author | Nicolás Reynolds <apoyosis@correo.inta.gob.ar> | 2011-03-03 12:57:59 -0300 |
---|---|---|
committer | Nicolás Reynolds <apoyosis@correo.inta.gob.ar> | 2011-03-03 12:57:59 -0300 |
commit | dc2ea8467c1f4bdac0c8409ffb5872dc51185a80 (patch) | |
tree | 1b9201a8dfa6b90cfc2e4ea993ad30563a40edcf | |
parent | 45c6bdd08103761adb6222e7c9af9dffbfa1bc7f (diff) | |
parent | 9ec4865ad0c8bbf85336ede03594ee8cefde3252 (diff) |
Merge branch 'master' of https://projects.archlinux.org/git/linux-2.6-ARCH
Conflicts:
PATCHCFG
-rw-r--r-- | PATCHCFG | 6 |
1 files changed, 3 insertions, 3 deletions
@@ -1,7 +1,7 @@ # Kernel source file -SRC="http://linux-libre.fsfla.org/pub/linux-libre/releases/2.6.37.1-libre/linux-2.6.37.1-libre.tar.bz2" +SRC="http://linux-libre.fsfla.org/pub/linux-libre/releases/2.6.37.2-libre/linux-2.6.37.2-libre.tar.bz2" # Original source directory -SRCORIG="linux-2.6.37.1" +SRCORIG="linux-2.6.37.2" # Our source directory SRCNAME="linux-2.6.37-LIBRE" # Patches: @@ -18,7 +18,7 @@ PATCHES=( aufs2-standalone-20110124.patch%1 ) # Name of the resulting patch (will be bzipped afterwards) -PATCHNAME="patch-2.6.37.1-1-LIBRE" +PATCHNAME="patch-2.6.37.2-1-LIBRE" # Run this before applying patches pre_apply() { |