tree 43be11fc480090c1f3698c02302ea88ca1f4ea51
parent 9fe02c03b4e892acb3c33819ac4385d43b2f0bd7
parent a5e696e5d0f1377ff6beb10d2f40edb6a3d1de18
author Linus Torvalds <torvalds@linux-foundation.org> 1242862339 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1242862339 -0700

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

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