Merge branch 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus
authorLinus Torvalds <torvalds@woody.linux-foundation.org>
Wed, 20 Jun 2007 21:40:52 +0000 (14:40 -0700)
committerLinus Torvalds <torvalds@woody.linux-foundation.org>
Wed, 20 Jun 2007 21:40:52 +0000 (14:40 -0700)
commit044f620ac65d0d90727cdbd0c058e4d150d62ddc
tree89bcf2829803979ff8384d14c159daebabc3244d
parentc53ab5d56c66816fe06dc6cd0abb93f6dd81a145
parent3b1d4ed5353af04d6aa20be2701727b9cdb2ac61
Merge branch 'upstream' of git://ftp.linux-mips.org/upstream-linus

* 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus:
  [MIPS] Don't drag a platform specific header into generic arch code.