[kernel] r18404 - in dists/sid/linux-2.6/debian: . patches/bugfix/all patches/bugfix/arm patches/features/all patches/series

[Bastian Blank]

Author: waldi
Date: Thu Dec 22 00:05:05 2011
New Revision: 18404

Log:
* debian/changelog: Set version to 3.1.4-1.
* debian/patches: Remove merged patches.

Deleted:
   dists/sid/linux-2.6/debian/patches/bugfix/all/hfs-fix-hfs_find_init-sb-ext_tree-NULL-ptr-oops.patch
   dists/sid/linux-2.6/debian/patches/bugfix/arm/nslu2-dma-size.patch
   dists/sid/linux-2.6/debian/patches/features/all/staging-r8712u-Add-new-USB-ID.patch
Modified:
   dists/sid/linux-2.6/debian/changelog
   dists/sid/linux-2.6/debian/patches/series/base

Modified: dists/sid/linux-2.6/debian/changelog
==============================================================================
--- dists/sid/linux-2.6/debian/changelog	Wed Dec 21 06:29:16 2011	(r18403)
+++ dists/sid/linux-2.6/debian/changelog	Thu Dec 22 00:05:05 2011	(r18404)
@@ -1,7 +1,11 @@
-linux-2.6 (3.1.5-2) UNRELEASED; urgency=low
+linux-2.6 (3.1.6-1) UNRELEASED; urgency=low
+
+  * New upstream stable update:
+    http://www.kernel.org/pub/linux/kernel/v3.x/ChangeLog-3.1.6
+    - staging: r8712u: Add new USB ID (Closes: #651622)
+    - [arm] setup: initialize arm_dma_zone_size earlier (Closes: #651215)
 
   [ Ben Hutchings ]
-  * staging: r8712u: Add new USB ID (Closes: #651622)
   * [x86] Enable HYPERV, HYPERV_STORAGE, HYPERV_NET, HYPERV_UTILS,
     HYPERV_MOUSE as modules (Closes: #652014)
   * cciss: Add IRQF_SHARED back in for the non-MSI(X) interrupt handler
@@ -12,9 +16,6 @@
     - [x86] Include et131x (Closes: #651440)
     - [x86] Include isci
 
-  [ Arnaud Patard ]
-  * [arm] setup: initialize arm_dma_zone_size earlier (Closes: #651215)
-
  -- Ben Hutchings <ben at decadent.org.uk>  Tue, 13 Dec 2011 05:50:44 +0000
 
 linux-2.6 (3.1.5-1) unstable; urgency=low

Modified: dists/sid/linux-2.6/debian/patches/series/base
==============================================================================
--- dists/sid/linux-2.6/debian/patches/series/base	Wed Dec 21 06:29:16 2011	(r18403)
+++ dists/sid/linux-2.6/debian/patches/series/base	Thu Dec 22 00:05:05 2011	(r18404)
@@ -52,7 +52,6 @@
 + bugfix/all/CIFS-Fixup-trivial-checkpatch-warning.patch
 + bugfix/all/Fix-build-break-when-freezer-not-configured.patch
 + bugfix/all/PM-Freezer-Reimplement-wait_event_freezekillable-usi.patch
-+ bugfix/all/hfs-fix-hfs_find_init-sb-ext_tree-NULL-ptr-oops.patch
 + features/x86/x86-Add-amilo-rfkill-driver-for-some-Fujitsu-Siemens.patch
 + bugfix/all/regulator_enable-nullpointer-dereference.patch
 
@@ -86,6 +85,4 @@
 + bugfix/all/0004-staging-brcm80211-restrict-register-access-method-fo.patch
 + bugfix/all/0005-staging-brcm80211-restrict-MIPS-dma-bug-workaround-t.patch
 + debian/inetpeer-hide-ABI-change-in-3.1.5.patch
-+ features/all/staging-r8712u-Add-new-USB-ID.patch
-+ bugfix/arm/nslu2-dma-size.patch
 + bugfix/all/cciss-Add-IRQF_SHARED-back-in-for-the-non-MSI-X-inte.patch