Merge https://projects.archlinux.org/git/linux-2.6-ARCH

Conflicts:
	PATCHCFG

1 files changed, 4 insertions, 1 deletions

diff --git a/PATCHCFG b/PATCHCFG
index 8323950..db883f8 100644
--- a/PATCHCFG
+++ b/PATCHCFG
@@ -18,13 +18,16 @@ PATCHES=(
          # fix #22343 udev crashes
          libata-alignment-2.6.37.patch%1
 
+         # fix #19234 i1915 display size
+         fix-i915.patch%1
+
          # add aufs2 support, in reference to:
          # http://aufs.sourceforge.net
          aufs2-base-20110124.patch%1
          aufs2-standalone-20110124.patch%1
         )
 # Name of the resulting patch (will be bzipped afterwards)
-PATCHNAME="patch-2.6.37-2-LIBRE"
+PATCHNAME="patch-2.6.37-4-LIBRE"
 
 # Run this before applying patches
 pre_apply() {