Merge branch 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus
authorLinus Torvalds <torvalds@linux-foundation.org>
Mon, 8 Jun 2009 16:22:53 +0000 (09:22 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Mon, 8 Jun 2009 16:22:53 +0000 (09:22 -0700)
commit46056be71c37378f518711da651e4bb76d650ee9
tree63c563bc3b84f22b517114ebb101b991958228a4
parent5284c6b99ea017f73c09b50f34a637ff9d5d26a0
parent5636919b5c909fee54a6ef5226475ecae012ad02
Merge branch 'upstream' of git://ftp.linux-mips.org/upstream-linus

* 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus:
  MIPS: Outline udelay and fix a few issues.
  MIPS: ioctl.h: Fix headers_check warnings
  MIPS: Cobalt: PCI bus is always required to obtain the board ID
  MIPS: Kconfig: Remove "Support for" from Cavium system type
  MIPS: Sibyte: Honor CONFIG_CMDLINE
  SSB: BCM47xx: Export ssb_watchdog_timer_set