sync r8609 from trunk

svn path=/dists/sid/linux-2.6/; revision=8618
This commit is contained in:
Maximilian Attems 2007-05-21 08:46:24 +00:00
parent ae7035e8ea
commit 6c7885068e
2 changed files with 6 additions and 2 deletions

View File

@ -33,7 +33,7 @@ CONFIG_NET_TULIP=y
# 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

6
debian/changelog vendored
View File

@ -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@gmail.com> Sun, 20 May 2007 09:19:54 -0600
[ maximilian attems ]
* sparc64: enable USB_SERIAL. (closes: #412740)
-- maximilian attems <maks@debian.org> Mon, 21 May 2007 10:46:31 +0200
linux-2.6 (2.6.21-2) unstable; urgency=low