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: R2: Fix problem with code that incorrectly modifies ebase.
  MIPS: Change {set,clear,change}_c0_<foo> to return old value.
  MIPS: compat: Remove duplicated #include
  MIPS: VR5500: Enable prefetch
  MIPS: Fix oops in dma_unmap_page on not coherent mips platforms

...

This commit is contained in:

Linus Torvalds 2009-03-26 11:02:50 -07:00

parent 1b5e62b42b 9fb4c2b9e0

commit 1646df40bb

5 changed files with 20 additions and 19 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

22

arch/mips/include/asm/mipsregs.h

View file

1

arch/mips/kernel/linux32.c

View file

12

arch/mips/kernel/traps.c

View file

2

arch/mips/mm/c-r4k.c

View file

2

arch/mips/mm/dma-default.c

View file