summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNicolás Reynolds <apoyosis@correo.inta.gob.ar>2011-05-10 11:44:21 -0300
committerNicolás Reynolds <apoyosis@correo.inta.gob.ar>2011-05-10 11:44:21 -0300
commit9221076cd44e4035dd0b7d75362cc6c96a743f24 (patch)
tree79074a2eb6b803617aac1ff3d585f46846a2837e
parent7ea60f965f56a584320ed970a53c6b68dba2f155 (diff)
parent39275986bae048a6d2a8a65247497d1db136b7c6 (diff)
Merge branch 'master' of https://projects.archlinux.org/git/linux-2.6-ARCH
Conflicts: PATCHCFG
-rw-r--r--PATCHCFG6
1 files changed, 3 insertions, 3 deletions
diff --git a/PATCHCFG b/PATCHCFG
index 9edc250..9b88af9 100644
--- a/PATCHCFG
+++ b/PATCHCFG
@@ -1,7 +1,7 @@
# Kernel source file
-SRC="http://linux-libre.fsfla.org/pub/linux-libre/releases/2.6.38.5-libre/linux-2.6.38.5-libre.tar.bz2"
+SRC="http://linux-libre.fsfla.org/pub/linux-libre/releases/2.6.38.6-libre/linux-2.6.38.6-libre.tar.bz2"
# Original source directory
-SRCORIG="linux-2.6.38.5"
+SRCORIG="linux-2.6.38.6"
# Our source directory
SRCNAME="linux-2.6.38-LIBRE"
# Patches:
@@ -28,7 +28,7 @@ PATCHES=(
aufs2-standalone-20110314.patch%1
)
# Name of the resulting patch (will be bzipped afterwards)
-PATCHNAME="patch-2.6.38.5-1-LIBRE"
+PATCHNAME="patch-2.6.38.6-1-LIBRE"
# Run this before applying patches
pre_apply() {