diff options
| author | Bastian Blank <waldi@debian.org> | 2006-07-09 11:35:40 +0000 |
|---|---|---|
| committer | Bastian Blank <waldi@debian.org> | 2006-07-09 11:35:40 +0000 |
| commit | 9d788482a282b6b54e7dda5094945d3ee319253d (patch) | |
| tree | 207912201bbde1feacbb6a804be806036cc258c0 | |
| parent | 06865eed71c544672c13daa67ff3a06beab65b10 (diff) | |
| download | kernel_replicant_linux-9d788482a282b6b54e7dda5094945d3ee319253d.tar.gz kernel_replicant_linux-9d788482a282b6b54e7dda5094945d3ee319253d.tar.bz2 kernel_replicant_linux-9d788482a282b6b54e7dda5094945d3ee319253d.zip | |
Merge /dists/sid/linux-2.6.16.
svn path=/dists/trunk/linux-2.6/; revision=6973
| -rw-r--r-- | debian/arch/powerpc/config.powerpc-miboot | 1 | ||||
| -rw-r--r-- | debian/changelog | 16 |
2 files changed, 16 insertions, 1 deletions
diff --git a/debian/arch/powerpc/config.powerpc-miboot b/debian/arch/powerpc/config.powerpc-miboot index 482ef646fa90..cfca6c60efc9 100644 --- a/debian/arch/powerpc/config.powerpc-miboot +++ b/debian/arch/powerpc/config.powerpc-miboot @@ -15,7 +15,6 @@ CONFIG_BASE_SMALL=1 # CONFIG_CPU_FREQ is not set # CONFIG_PM is not set # CONFIG_HIGHMEM is not set -# CONFIG_PROC_DEVICETREE is not set # CONFIG_PREP_RESIDUAL is not set # CONFIG_LBD is not set # CONFIG_THERM_WINDTUNNEL is not set diff --git a/debian/changelog b/debian/changelog index 6858e95a77a0..ef2956e88622 100644 --- a/debian/changelog +++ b/debian/changelog @@ -136,6 +136,22 @@ linux-2.6 (2.6.16+2.6.17-rc3-0experimental.1) experimental; urgency=low -- Frederik Schüler <fs@debian.org> Sun, 7 May 2006 17:06:29 +0200 +linux-2.6.16 (2.6.16-16) unstable; urgency=low + + [ Sven Luther ] + * [powerpc] Added console=hvc0 default commandline option to powerpc64 flavour. + * [powerpc] Now THERM_PM72 and all WINDFARMs are builtin, for better fan control. + + [ Martin Michlmayr ] + * [arm/nslu2] Disable SE Linux support for now so the kernel fits into + flash. Closes: #376926. + + [ Bastian Blank ] + * [powerpc,powerpc-miboot] Enable OpenFirmware device tree support. + (closes: #376012) + + -- Bastian Blank <waldi@debian.org> Sat, 8 Jul 2006 17:57:57 +0200 + linux-2.6.16 (2.6.16-15) unstable; urgency=low [ maximilian attems ] |