[kernel] r5874 - in people/waldi/linux-2.6: . debian debian/arch debian/arch/amd64 debian/arch/i386 debian/arch/powerpc debian/arch/s390 debian/patches debian/patches/series

[Bastian Blank]

Author: waldi
Date: Mon Feb 13 22:10:55 2006
New Revision: 5874

Removed:
   people/waldi/linux-2.6/debian/patches/arm-fix-dc21285.patch
   people/waldi/linux-2.6/debian/patches/git-extract-s390.patch
Modified:
   people/waldi/linux-2.6/   (props changed)
   people/waldi/linux-2.6/debian/arch/amd64/config
   people/waldi/linux-2.6/debian/arch/config
   people/waldi/linux-2.6/debian/arch/i386/config
   people/waldi/linux-2.6/debian/arch/powerpc/config
   people/waldi/linux-2.6/debian/arch/s390/config
   people/waldi/linux-2.6/debian/changelog
   people/waldi/linux-2.6/debian/patches/series/0experimental.1
Log:
Merge /dists/trunk/linux-2.6.


Modified: people/waldi/linux-2.6/debian/arch/amd64/config
==============================================================================
--- people/waldi/linux-2.6/debian/arch/amd64/config	(original)
+++ people/waldi/linux-2.6/debian/arch/amd64/config	Mon Feb 13 22:10:55 2006
@@ -969,6 +969,7 @@
 CONFIG_SENSORS_ADM1031=m
 CONFIG_SENSORS_ASB100=m
 CONFIG_SENSORS_DS1621=m
+CONFIG_SENSORS_F71805F=m
 CONFIG_SENSORS_FSCHER=m
 CONFIG_SENSORS_FSCPOS=m
 CONFIG_SENSORS_GL518SM=m

Modified: people/waldi/linux-2.6/debian/arch/config
==============================================================================
--- people/waldi/linux-2.6/debian/arch/config	(original)
+++ people/waldi/linux-2.6/debian/arch/config	Mon Feb 13 22:10:55 2006
@@ -341,6 +341,7 @@
 #
 # Networking options
 #
+# CONFIG_NETDEBUG is not set
 CONFIG_XFRM=y
 CONFIG_XFRM_USER=m
 CONFIG_NET_KEY=m

Modified: people/waldi/linux-2.6/debian/arch/i386/config
==============================================================================
--- people/waldi/linux-2.6/debian/arch/i386/config	(original)
+++ people/waldi/linux-2.6/debian/arch/i386/config	Mon Feb 13 22:10:55 2006
@@ -1151,6 +1151,7 @@
 CONFIG_SENSORS_ADM1031=m
 CONFIG_SENSORS_ASB100=m
 CONFIG_SENSORS_DS1621=m
+CONFIG_SENSORS_F71805F=m
 CONFIG_SENSORS_FSCHER=m
 CONFIG_SENSORS_FSCPOS=m
 CONFIG_SENSORS_GL518SM=m

Modified: people/waldi/linux-2.6/debian/arch/powerpc/config
==============================================================================
--- people/waldi/linux-2.6/debian/arch/powerpc/config	(original)
+++ people/waldi/linux-2.6/debian/arch/powerpc/config	Mon Feb 13 22:10:55 2006
@@ -744,6 +744,7 @@
 CONFIG_SENSORS_ADM1031=m
 CONFIG_SENSORS_ASB100=m
 CONFIG_SENSORS_DS1621=m
+CONFIG_SENSORS_F71805F=m
 CONFIG_SENSORS_FSCHER=m
 CONFIG_SENSORS_FSCPOS=m
 CONFIG_SENSORS_GL518SM=m

Modified: people/waldi/linux-2.6/debian/arch/s390/config
==============================================================================
--- people/waldi/linux-2.6/debian/arch/s390/config	(original)
+++ people/waldi/linux-2.6/debian/arch/s390/config	Mon Feb 13 22:10:55 2006
@@ -52,6 +52,7 @@
 CONFIG_DASD_ECKD=m
 CONFIG_DASD_FBA=m
 # CONFIG_DASD_DIAG is not set
+# CONFIG_DASD_EER is not set
 # CONFIG_DASD_CMB is not set
 # CONFIG_ATA_OVER_ETH is not set
 # CONFIG_MD_RAID10 is not set

Modified: people/waldi/linux-2.6/debian/changelog
==============================================================================
--- people/waldi/linux-2.6/debian/changelog	(original)
+++ people/waldi/linux-2.6/debian/changelog	Mon Feb 13 22:10:55 2006
@@ -1,4 +1,4 @@
-linux-2.6 (2.6.15+2.6.16-rc2-0experimental.1) UNRELEASED; urgency=low
+linux-2.6 (2.6.15+2.6.16-rc3-0experimental.1) UNRELEASED; urgency=low
 
   [ Frederik Schüler ]
   * New upstream release.
@@ -18,7 +18,7 @@
     screen output on SunBlade 100) is still present. Thanks to
     Luis Ortiz for pointing it out.
     
- -- Frederik Schüler <fs at debian.org>  Fri,  3 Feb 2006 14:36:04 +0100
+ -- Bastian Blank <waldi at debian.org>  Mon, 13 Feb 2006 20:19:46 +0000
 
 linux-2.6 (2.6.15-3) unstable; urgency=low
 

Modified: people/waldi/linux-2.6/debian/patches/series/0experimental.1
==============================================================================
--- people/waldi/linux-2.6/debian/patches/series/0experimental.1	(original)
+++ people/waldi/linux-2.6/debian/patches/series/0experimental.1	Mon Feb 13 22:10:55 2006
@@ -5,7 +5,6 @@
 + modular-ide-pnp.patch
 + version.patch
 # 
-+ arm-fix-dc21285.patch
 + mtdpart-redboot-fis-byteswap.patch
 + ia64-irq-affinity-upfix.patch
 + powerpc-mkvmlinuz-support.patch
@@ -17,4 +16,3 @@
 #FIXME + powerpc-apus.patch
 + sparc64-hme-lockup.patch
 + sparc64-atyfb-xl-gr.patch
-+ git-extract-s390.patch