[kernel] r6272 - in dists/trunk/linux-2.6: . debian debian/arch/amd64

[Bastian Blank]

Author: waldi
Date: Thu Mar 23 20:40:54 2006
New Revision: 6272

Modified:
   dists/trunk/linux-2.6/   (props changed)
   dists/trunk/linux-2.6/debian/arch/amd64/defines
   dists/trunk/linux-2.6/debian/changelog
Log:
Merge /dists/sid/linux-2.6.


Modified: dists/trunk/linux-2.6/debian/arch/amd64/defines
==============================================================================
--- dists/trunk/linux-2.6/debian/arch/amd64/defines	(original)
+++ dists/trunk/linux-2.6/debian/arch/amd64/defines	Thu Mar 23 20:40:54 2006
@@ -6,7 +6,7 @@
  em64t-p4
  em64t-p4-smp
 kernel-arch: x86_64
-kernel-header-dirs: x86_64
+kernel-header-dirs: x86_64 i386
 subarches:
  vserver
  xen

Modified: dists/trunk/linux-2.6/debian/changelog
==============================================================================
--- dists/trunk/linux-2.6/debian/changelog	(original)
+++ dists/trunk/linux-2.6/debian/changelog	Thu Mar 23 20:40:54 2006
@@ -1,14 +1,20 @@
 linux-2.6 (2.6.16-99experimental.1) UNRELEASED; urgency=low
 
-  [ Bastian Blank ]
   *
 
+ -- Bastian Blank <waldi at debian.org>  Thu, 23 Mar 2006 21:40:17 +0100
+
+linux-2.6 (2.6.16-3) UNRELEASED; urgency=low
+
+  [ Frederik Schüler ]
+  * [amd64] Add asm-i386 to the linux-headers packages.
+
   [ Jonas Smedegaard ]
-  * Tighten yaird dependency to at least 0.0.12-8 (supporting
-    Linux 2.6.16 uppercase hex in Kconfig and new IDE sysfs naming, and
-    VIA IDE on powerpc).
+  * Tighten yaird dependency to at least 0.0.12-8 (supporting Linux
+    2.6.16 uppercase hex in Kconfig and new IDE sysfs naming, and VIA
+    IDE on powerpc).
 
- -- Jonas Smedegaard <dr at jones.dk>  Thu, 23 Mar 2006 12:23:22 +0100
+ -- Frederik Schüler <fs at debian.org>  Thu, 23 Mar 2006 18:47:46 +0100
 
 linux-2.6 (2.6.16-2) unstable; urgency=low