From: Linus Torvalds Date: Tue, 20 Feb 2007 18:14:29 +0000 (-0800) Subject: Merge branch 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus X-Git-Tag: v2.6.21-rc1~54 X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=d7f786e06538081dd10c97931a89418699fe609d;p=linux-2.6-omap-h63xx.git Merge branch 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus * 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus: [NET] Eliminate user-selectable CONFIG_MV643XX_ETH_[012] [MIPS] Drop __init from init_8259A() [MIPS] Fix Kconfig typo bug [MIPS] Fix double signal on trap and break instruction [MIPS] sigset_32 has been made redundand by compat_sigset_t. [MIPS] emma2rh: Remove needless inclusion. [MIPS] Add MTD device support for Cobalt --- d7f786e06538081dd10c97931a89418699fe609d