tree 750c6b313711c9df5d6a12197587e0372764df13
parent e5717c48ed52feebd59756578debd34eaeb9d262
parent f00a3ec4d47b51c5995fe10f8252a90aca331e62
author Linus Torvalds <torvalds@woody.linux-foundation.org> 1171995269 -0800
committer Linus Torvalds <torvalds@woody.linux-foundation.org> 1171995269 -0800

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 <asm/i8259.h> inclusion.
  [MIPS] Add MTD device support for Cobalt