From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Wed, 20 May 2009 23:32:19 +0000 (-0700)
Subject: Merge branch 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus
X-Git-Tag: Ubuntu-5.0.0-8.9~27427
X-Git-Url: https://git.proxmox.com/?a=commitdiff_plain;h=a9523f45264aee8ec8d9f82091a0dfe1418fb2f8;p=mirror_ubuntu-disco-kernel.git

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

a9523f45264aee8ec8d9f82091a0dfe1418fb2f8