Merge branch 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus
authorLinus Torvalds <torvalds@woody.linux-foundation.org>
Fri, 15 Jun 2007 23:14:08 +0000 (16:14 -0700)
committerLinus Torvalds <torvalds@woody.linux-foundation.org>
Fri, 15 Jun 2007 23:14:08 +0000 (16:14 -0700)
commit4ff4275b24fdcca189b33f9a73fe7abef1dc84bc
treed78f65e793d80e3a4c454d37e710f182de4bf34e
parente00eea42f24550beb9940e641402450f695c888a
parent7b4f4ec21038ac13c63d130357d1c3015ec3f3e8
Merge branch 'upstream' of git://ftp.linux-mips.org/upstream-linus

* 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus:
  [MIPS] Fix builds where MSC01E_xxx is undefined.
  [MIPS] Separate performance counter interrupts
  [MIPS] Malta: Fix for SOCitSC based Maltas