diff options
| author | Nicolás Reynolds <apoyosis@correo.inta.gob.ar> | 2011-03-22 12:46:55 -0300 |
|---|---|---|
| committer | Nicolás Reynolds <apoyosis@correo.inta.gob.ar> | 2011-03-22 12:46:55 -0300 |
| commit | 09dff2df680bf245e0f7e5d881ba48593789f46a (patch) | |
| tree | fe273286e61e8c1dfa7c10f80ad2861c8fb6a123 /PATCHCFG | |
| parent | c581f999825d62aa2a1306be9f3e5058b4ced0dc (diff) | |
| parent | 6482fa4ba90a7583eb300149ad0d4e7cadac2ee5 (diff) | |
Merge branch 'master' of https://projects.archlinux.org/git/linux-2.6-ARCH
Conflicts:
PATCHCFG
Diffstat (limited to 'PATCHCFG')
| -rw-r--r-- | PATCHCFG | 9 |
1 files changed, 8 insertions, 1 deletions
@@ -9,6 +9,13 @@ SRCNAME="linux-2.6.38-LIBRE" # or # filename%patchlevel (file must be in patches/ subdirectory) PATCHES=( + # add upstream patch from 2.6.37 series + #ftp://ftp.kernel.org/pub/linux/kernel/v2.6/patch-2.6.38.1.bz2%1 + + # add latest fixes from stable queue, if needed + # http://git.kernel.org/?p=linux/kernel/git/stable/stable-queue.git + 2.6.38.1-pre.patch%1 + # fix #19234 i1915 display size fix-i915.patch%1 @@ -18,7 +25,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-LIBRE" # Run this before applying patches pre_apply() { |