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

Conflicts:
	PATCHCFG

1 files changed, 6 insertions, 3 deletions

diff --git a/PATCHCFG b/PATCHCFG
index b777633..010f4c9 100644
--- a/PATCHCFG
+++ b/PATCHCFG
@@ -15,13 +15,16 @@ PATCHES=(
          # add latest fixes from stable queue, if needed
          # http://git.kernel.org/?p=linux/kernel/git/stable/stable-queue.git
 
+         # fix #22343 udev crashes
+         libata-alignment-2.6.37.patch%1
+
          # add aufs2 support, in reference to:
          # http://aufs.sourceforge.net
-         aufs2-base-20110105.patch%1
-         aufs2-standalone-20110105.patch%1
+         aufs2-base-20110124.patch%1
+         aufs2-standalone-20110124.patch%1
         )
 # Name of the resulting patch (will be bzipped afterwards)
-PATCHNAME="patch-2.6.37-1-LIBRE"
+PATCHNAME="patch-2.6.37-2-ARCH"
 
 # Run this before applying patches
 pre_apply() {