[kernel] r18420 - in dists/trunk/linux-2.6: . debian

[Ben Hutchings]

Author: benh
Date: Sat Dec 24 11:14:29 2011
New Revision: 18420

Log:
Merge from sid again (release of 3.1.6-1)

Modified:
   dists/trunk/linux-2.6/   (props changed)
   dists/trunk/linux-2.6/debian/changelog

Modified: dists/trunk/linux-2.6/debian/changelog
==============================================================================
--- dists/trunk/linux-2.6/debian/changelog	Sat Dec 24 11:02:52 2011	(r18419)
+++ dists/trunk/linux-2.6/debian/changelog	Sat Dec 24 11:14:29 2011	(r18420)
@@ -43,7 +43,7 @@
 
  -- Ben Hutchings <ben at decadent.org.uk>  Sat, 03 Dec 2011 23:07:41 +0000
 
-linux-2.6 (3.1.6-1) UNRELEASED; urgency=low
+linux-2.6 (3.1.6-1) unstable; urgency=low
 
   * New upstream stable update:
     http://www.kernel.org/pub/linux/kernel/v3.x/ChangeLog-3.1.6
@@ -61,7 +61,7 @@
     - [x86] Include et131x (Closes: #651440)
     - [x86] Include isci (Closes: #652897)
 
- -- Ben Hutchings <ben at decadent.org.uk>  Tue, 13 Dec 2011 05:50:44 +0000
+ -- Bastian Blank <waldi at debian.org>  Fri, 23 Dec 2011 17:02:26 +0100
 
 linux-2.6 (3.1.5-1) unstable; urgency=low