[kernel] r18894 - in dists/squeeze/linux-2.6/debian: . config/s390

[Dann Frazier]

Author: dannf
Date: Fri Mar 30 18:58:49 2012
New Revision: 18894

Log:
pull abi ignore-changes from sid

Modified:
   dists/squeeze/linux-2.6/debian/changelog
   dists/squeeze/linux-2.6/debian/config/s390/defines

Modified: dists/squeeze/linux-2.6/debian/changelog
==============================================================================
--- dists/squeeze/linux-2.6/debian/changelog	Thu Mar 29 07:27:07 2012	(r18893)
+++ dists/squeeze/linux-2.6/debian/changelog	Fri Mar 30 18:58:49 2012	(r18894)
@@ -1,3 +1,9 @@
+linux-2.6 (2.6.32-43) UNRELEASED; urgency=high
+
+  * Ignore arch_pick_mmap_layout ABI change on s390
+
+ -- dann frazier <dannf at debian.org>  Thu, 29 Mar 2012 15:37:29 -0600
+
 linux-2.6 (2.6.32-42) stable; urgency=high
 
   [ Uwe Kleine-König ]

Modified: dists/squeeze/linux-2.6/debian/config/s390/defines
==============================================================================
--- dists/squeeze/linux-2.6/debian/config/s390/defines	Thu Mar 29 07:27:07 2012	(r18893)
+++ dists/squeeze/linux-2.6/debian/config/s390/defines	Fri Mar 30 18:58:49 2012	(r18894)
@@ -1,3 +1,8 @@
+[abi]
+ignore-changes:
+# Seems to be exported by mistake; no other architecture does
+ arch_pick_mmap_layout
+
 [base]
 featuresets:
  vserver