Merge /dists/sid/linux-2.6.

svn path=/dists/trunk/linux-2.6/; revision=11117

debian/changelog

@@ -106,6 +106,24 @@ linux-2.6 (2.6.25-1~experimental.1) UNRELEASED; urgency=low
 
  -- Bastian Blank <waldi@debian.org>  Tue, 26 Feb 2008 23:59:55 -0700
 
+linux-2.6 (2.6.24-6) unstable; urgency=high
+
+  [ Martin Michlmayr ]
+  * [armel] Fix FTBFS on armel by enabling CONFIG_USB_USBNET=m in
+    armel/config, as it was done for arm/config already.
+  * [armel] Add oabi shim for fstatat64 (Riku Voipio)
+
+  [ Gordon Farquharson ]
+  * [arm/iop32x] Do not build the ARTOP PATA driver (PATA_ARTOP).
+  * [arm/iop32x] Enable MTD_CMDLINE_PARTS.
+
+  [ Kyle McMartin ]
+  * [hppa] fix pdc_console panic at boot (closes: #476292).
+  * [hppa] properly flush user signal tramps
+  * [hppa] special case futex cmpxchg on kernel space NULL (closes: 476285).
+
+ -- Bastian Blank <waldi@debian.org>  Fri, 18 Apr 2008 19:41:30 +0200
+
 linux-2.6 (2.6.24-5) unstable; urgency=low
 
   [ Gordon Farquharson ]

debian/config/arm/config.iop32x

@@ -352,6 +352,7 @@ CONFIG_MOUSE_PS2=y
 # CONFIG_MOUSE_SERIAL is not set
 CONFIG_MOUSE_APPLETOUCH=m
 # CONFIG_MOUSE_VSXXXAA is not set
+# CONFIG_PATA_ARTOP is not set
 
 ##
 ## file: drivers/input/serio/Kconfig
@@ -459,7 +460,7 @@ CONFIG_MTD_REDBOOT_PARTS=y
 CONFIG_MTD_REDBOOT_DIRECTORY_BLOCK=-1
 # CONFIG_MTD_REDBOOT_PARTS_UNALLOCATED is not set
 # CONFIG_MTD_REDBOOT_PARTS_READONLY is not set
-# CONFIG_MTD_CMDLINE_PARTS is not set
+CONFIG_MTD_CMDLINE_PARTS=y
 # CONFIG_MTD_AFS_PARTS is not set
 CONFIG_MTD_CHAR=y
 CONFIG_MTD_BLOCK=y