Merge branch 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus
authorLinus Torvalds <torvalds@linux-foundation.org>
Sat, 13 Dec 2008 19:26:34 +0000 (11:26 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Sat, 13 Dec 2008 19:26:34 +0000 (11:26 -0800)
commitfae1aa4a0bcfdd35735a38949650216aee964474
treed733a7bcc3921e253d7010cdcaa39c83394e9c8f
parent1c55f18717304100a5f624c923f7cb6511b4116d
parent6d8a52d7f09babf6cff1df32fe0b8ea47cf753f3
Merge branch 'upstream' of git://ftp.linux-mips.org/upstream-linus

* 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus:
  MIPS: IP32: Update defconfig
  MIPS: Add missing calls to plat_unmap_dma_mem.
  MIPS: Kconfig: Fix the arch-specific header path
  MIPS: Use EI/DI for MIPS R2.