Merge branch 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus
commit240d3b54e3a8a8d469f0ff6deacf52f4b751f55a
authorLinus Torvalds <torvalds@woody.linux-foundation.org>
Tue, 22 Jan 2008 03:40:05 +0000 (21 19:40 -0800)
committerLinus Torvalds <torvalds@woody.linux-foundation.org>
Tue, 22 Jan 2008 03:40:05 +0000 (21 19:40 -0800)
treefda052cb167f335148028712d0c3b73fb470b562
parenta6dbb1ef2fc8d73578eacd02ac701f4233175c9f
parent06675e6f4fb00a63575f4b85da305c3ab19e6e5d
Merge branch 'upstream' of git://ftp.linux-mips.org/upstream-linus

* 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus:
  tc35815: Use irq number for tc35815-mac platform device id
  [MIPS] Malta: Fix reading the PCI clock frequency on big-endian
  [MIPS] SMTC: Fix build error.