From: Linus Torvalds <torvalds@woody.linux-foundation.org>
Date: Fri, 15 Jun 2007 23:14:08 +0000 (-0700)
Subject: Merge branch 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus
X-Git-Tag: v2.6.22-rc5~30
X-Git-Url: http://git.samba.org/samba.git/?p=sfrench%2Fcifs-2.6.git;a=commitdiff_plain;h=4ff4275b24fdcca189b33f9a73fe7abef1dc84bc

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
---

4ff4275b24fdcca189b33f9a73fe7abef1dc84bc