tree 63c563bc3b84f22b517114ebb101b991958228a4
parent 5284c6b99ea017f73c09b50f34a637ff9d5d26a0
parent 5636919b5c909fee54a6ef5226475ecae012ad02
author Linus Torvalds <torvalds@linux-foundation.org> 1244478173 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1244478173 -0700

Merge branch 'upstream' of git://ftp.linux-mips.org/pub/scm/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