diff options
author | Nicolás Reynolds <apoyosis@correo.inta.gob.ar> | 2011-04-18 11:29:04 -0300 |
---|---|---|
committer | Nicolás Reynolds <apoyosis@correo.inta.gob.ar> | 2011-04-18 11:29:04 -0300 |
commit | 69bff8d36f5ec8e9beffeb41aaede0f07418d7f4 (patch) | |
tree | 4de90b9e04682f0f147dc1319b1783d1ef3733c0 /PATCHCFG | |
parent | cc23ca504e54659c24f0663a7b9221db21bd8fb2 (diff) | |
parent | ee751891605129530527d57dc245b10efec20942 (diff) |
Merge branch 'master' of https://projects.archlinux.org/git/linux-2.6-ARCH
Conflicts:
PATCHCFG
Diffstat (limited to 'PATCHCFG')
-rw-r--r-- | PATCHCFG | 12 |
1 files changed, 8 insertions, 4 deletions
@@ -1,7 +1,7 @@ # Kernel source file -SRC="http://linux-libre.fsfla.org/pub/linux-libre/releases/2.6.38.1-libre/linux-2.6.38.1-libre.tar.bz2" +SRC="http://linux-libre.fsfla.org/pub/linux-libre/releases/2.6.38.2-libre/linux-2.6.38.2-libre.tar.bz2" # Original source directory -SRCORIG="linux-2.6.38.1" +SRCORIG="linux-2.6.38.2" # Our source directory SRCNAME="linux-2.6.38-LIBRE" # Patches: @@ -9,7 +9,9 @@ SRCNAME="linux-2.6.38-LIBRE" # or # filename%patchlevel (file must be in patches/ subdirectory) PATCHES=( - + # add latest fixes from stable queue, if needed + # http://git.kernel.org/?p=linux/kernel/git/stable/stable-queue.git + 2.6.38.3-pre.patch%1 # fix #19234 i1915 display size fix-i915.patch%1 @@ -19,6 +21,8 @@ PATCHES=( # fix i915 pipelining glitches # https://bugs.freedesktop.org/show_bug.cgi?id=34584 i915-pipeline.patch%1 + # fix ips module + intel_ips-produces-constant-load-of-1.patch%1 # add aufs2 support, in reference to: # http://aufs.sourceforge.net @@ -26,7 +30,7 @@ PATCHES=( aufs2-standalone-20110314.patch%1 ) # Name of the resulting patch (will be bzipped afterwards) -PATCHNAME="patch-2.6.38.1-LIBRE" +PATCHNAME="patch-2.6.38.2-1-LIBRE" # Run this before applying patches pre_apply() { |