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: 64-bit: Fix system lockup.
  MIPS: IP28: Change to build with -mr10k-cache-barrier=store
  MIPS: IP22: Fix hang in power button interrupt handler
  MIPS: IP32: Fix hang on shutdown in power button interrupt handler.

...

This commit is contained in:

Linus Torvalds 2009-05-20 16:32:19 -07:00

parent 9fe02c03b4 a5e696e5d0

commit a9523f4526

6 changed files with 10 additions and 15 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

6

arch/mips/Makefile

View file

6

arch/mips/mm/tlb-r3k.c

View file

6

arch/mips/mm/tlb-r4k.c

View file

3

arch/mips/mm/tlb-r8k.c

View file

2

arch/mips/sgi-ip22/ip22-reset.c

View file

2

arch/mips/sgi-ip32/ip32-reset.c

View file