Merge branch 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus
authorLinus Torvalds <[email protected]>
Tue, 22 Jan 2008 03:40:05 +0000 (19:40 -0800)
committerLinus Torvalds <[email protected]>
Tue, 22 Jan 2008 03:40:05 +0000 (19:40 -0800)
* '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.


Trivial merge