[kernel] r8618 - in dists/sid/linux-2.6/debian: . arch/sparc

[Maximilian Attems]

Author: maks
Date: Mon May 21 08:46:24 2007
New Revision: 8618

Log:
sync r8609 from trunk


Modified:
   dists/sid/linux-2.6/debian/arch/sparc/config.sparc64
   dists/sid/linux-2.6/debian/changelog

Modified: dists/sid/linux-2.6/debian/arch/sparc/config.sparc64
==============================================================================
--- dists/sid/linux-2.6/debian/arch/sparc/config.sparc64	(original)
+++ dists/sid/linux-2.6/debian/arch/sparc/config.sparc64	Mon May 21 08:46:24 2007
@@ -33,7 +33,7 @@
 # CONFIG_IEEE1394_VERBOSEDEBUG is not set
 CONFIG_DISPLAY7SEG=m
 CONFIG_USB_UHCI_HCD=m
-# CONFIG_USB_SERIAL is not set
+CONFIG_USB_SERIAL=m
 # CONFIG_SCSI_IPR_TRACE is not set
 # CONFIG_DE4X5 is not set
 # CONFIG_PARPORT_PC_SUPERIO is not set

Modified: dists/sid/linux-2.6/debian/changelog
==============================================================================
--- dists/sid/linux-2.6/debian/changelog	(original)
+++ dists/sid/linux-2.6/debian/changelog	Mon May 21 08:46:24 2007
@@ -1,8 +1,12 @@
 linux-2.6 (2.6.21-3) UNRELEASED; urgency=low
 
+  [ Gordon Farquharson ]
   * arm/ixp4xx: Add patch to set NSLU2 timer frequency.
 
- -- Gordon Farquharson <gordonfarquharson at gmail.com>  Sun, 20 May 2007 09:19:54 -0600
+  [ maximilian attems ]
+  * sparc64: enable USB_SERIAL. (closes: #412740)
+
+ -- maximilian attems <maks at debian.org>  Mon, 21 May 2007 10:46:31 +0200
 
 linux-2.6 (2.6.21-2) unstable; urgency=low