]> pilppa.com Git - linux-2.6-omap-h63xx.git/commitdiff
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)
* '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.


Trivial merge