Merge branch 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus

Browse source

* '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.

...

This commit is contained in:

Linus Torvalds 2008-12-13 11:26:34 -08:00

parent 1c55f18717 6d8a52d7f0

commit fae1aa4a0b

4 changed files with 638 additions and 437 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download patch file Download diff file Expand all files Collapse all files

2

arch/mips/Kconfig.debug

View file

1096

arch/mips/configs/ip32_defconfig

View file

10

arch/mips/include/asm/asmmacro.h

View file

3

arch/mips/mm/dma-default.c

View file