Merge /dists/sid/linux-2.6.

svn path=/dists/trunk/linux-2.6/; revision=6265
This commit is contained in:
Bastian Blank 2006-03-22 17:49:41 +00:00
parent 7cf3027ca7
commit e4bd48571b
11 changed files with 16 additions and 52 deletions

View File

@ -652,6 +652,7 @@ CONFIG_CICADA_PHY=m
# Ethernet (10 or 100Mbit)
#
CONFIG_NET_ETHERNET=y
CONFIG_MACLIST=y
CONFIG_MII=y
# CONFIG_HAPPYMEAL is not set
# CONFIG_SUNGEM is not set

View File

@ -0,0 +1 @@
CONFIG_MIPS=y

View File

@ -1,10 +1,3 @@
#
# Automatically generated make config: don't edit
# Linux kernel version: 2.6.16-rc5
# Thu Mar 2 14:53:47 2006
#
CONFIG_MIPS=y
#
# Machine selection
#

View File

@ -1,10 +1,3 @@
#
# Automatically generated make config: don't edit
# Linux kernel version: 2.6.16-rc5
# Thu Mar 2 14:54:35 2006
#
CONFIG_MIPS=y
#
# Machine selection
#

View File

@ -1,10 +1,3 @@
#
# Automatically generated make config: don't edit
# Linux kernel version: 2.6.16-rc5
# Thu Mar 2 14:54:52 2006
#
CONFIG_MIPS=y
#
# Machine selection
#

View File

@ -1,10 +1,3 @@
#
# Automatically generated make config: don't edit
# Linux kernel version: 2.6.16-rc5
# Thu Mar 2 14:54:52 2006
#
CONFIG_MIPS=y
#
# Machine selection
#

View File

@ -0,0 +1 @@
CONFIG_MIPS=y

View File

@ -1,10 +1,3 @@
#
# Automatically generated make config: don't edit
# Linux kernel version: 2.6.16-rc5
# Thu Mar 2 14:58:35 2006
#
CONFIG_MIPS=y
#
# Machine selection
#
@ -236,7 +229,7 @@ CONFIG_NET=y
# Networking options
#
# CONFIG_NETDEBUG is not set
CONFIG_PACKET=m
CONFIG_PACKET=y
CONFIG_PACKET_MMAP=y
CONFIG_UNIX=y
CONFIG_XFRM=y

View File

@ -1,10 +1,3 @@
#
# Automatically generated make config: don't edit
# Linux kernel version: 2.6.16-rc5
# Thu Mar 2 14:55:46 2006
#
CONFIG_MIPS=y
#
# Machine selection
#

View File

@ -1,10 +1,3 @@
#
# Automatically generated make config: don't edit
# Linux kernel version: 2.6.16-rc5
# Thu Mar 2 14:55:46 2006
#
CONFIG_MIPS=y
#
# Machine selection
#

14
debian/changelog vendored
View File

@ -4,13 +4,23 @@ linux-2.6 (2.6.16-99experimental.1) UNRELEASED; urgency=low
-- Bastian Blank <waldi@debian.org> Mon, 20 Mar 2006 12:33:49 +0100
linux-2.6 (2.6.16-2) UNRELEASED; urgency=low
linux-2.6 (2.6.16-2) unstable; urgency=low
[ dann frazier ]
* [ia64] Set unconfigured options:
CONFIG_PNP_DEBUG=n and CONFIG_NET_SB1000=m
* [hppa] Update config for 2.6.16
-- dann frazier <dannf@debian.org> Tue, 21 Mar 2006 15:31:07 -0700
[ Martin Michlmayr ]
* [mips/mipsel] Put something in the generic config file because diff
will otherwise remove the empty file, causing the build to fail.
* [mipsel/r5k-cobalt] Set CONFIG_PACKET=y.
* [arm] Set CONFIG_MACLIST=y for ixp4xx because nas100d needs it.
[ Frederik Schüler ]
* Add Maximilian Attems to uploaders list.
-- Martin Michlmayr <tbm@cyrius.com> Wed, 22 Mar 2006 15:15:14 +0000
linux-2.6 (2.6.16-1) unstable; urgency=low