merge in r8500 for consistency

svn path=/dists/trunk/linux-2.6/; revision=8568
This commit is contained in:
dann frazier 2007-05-11 01:15:54 +00:00
parent 4876441e57
commit 082a9f7c08
1 changed files with 3 additions and 3 deletions

6
debian/changelog vendored
View File

@ -34,7 +34,7 @@ linux-2.6 (2.6.21-1~experimental.1) UNRELEASED; urgency=low
-- maximilian attems <maks@debian.org> Sat, 28 Apr 2007 18:53:40 +0200
linux-2.6 (2.6.20-3) UNRELEASED; urgency=low
linux-2.6 (2.6.20-3) unstable; urgency=low
[ Gordon Farquharson ]
* arm: Mark CONFIG_MTD_NAND_CAFE and CONFIG_NETXEN_NIC as broken to
@ -42,9 +42,9 @@ linux-2.6 (2.6.20-3) UNRELEASED; urgency=low
[ Bastian Blank ]
* Disable new pata drivers. (closes: #419458)
* Disable pata in ata_piix.
* Disable pata in ata_piix.
-- Bastian Blank <waldi@debian.org> Tue, 24 Apr 2007 08:01:54 +0200
-- Bastian Blank <waldi@debian.org> Tue, 24 Apr 2007 09:54:44 +0200
linux-2.6 (2.6.20-2) unstable; urgency=low