Merge branch 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus
authorLinus Torvalds <torvalds@linux-foundation.org>
Thu, 12 Mar 2009 16:25:10 +0000 (09:25 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Thu, 12 Mar 2009 16:25:10 +0000 (09:25 -0700)
commit8c57a8fa4e9226a44c4e98327852936df3b6791b
tree683ee9cf0eb5e249ac41c64ef711ca9a8f2b6fbf
parent0789d8fccb5673001b54536d8f2f87f5db0d646f
parent0a7c808fccc86418acf0e0b4b119094fb56af952
Merge branch 'upstream' of git://ftp.linux-mips.org/upstream-linus

* 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus:
  MIPS: IP27: Enable RAID5 module
  MIPS: TXx9: update defconfigs
  MIPS: NEC VR5500 processor support fixup
  MIPS: Fix build of non-CONFIG_SYSVIPC version of sys_32_ipc