From: Linus Torvalds <torvalds@woody.linux-foundation.org>
Date: Tue, 11 Dec 2007 03:45:17 +0000 (-0800)
Subject: Merge branch 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=c34c15b02e0af7e235f84ca1471747ee1cbb1b87;p=GitHub%2Fmt8127%2Fandroid_kernel_alcatel_ttab.git

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

* 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus:
  [MIPS] Malta: Enable tickless and highres timers.
  [MIPS] Bigsur: Enable tickless and and highres timers.
  qemu: do not enable IP7 blindly
  [MIPS] Alchemy: Fix Au1x SD controller IRQ
  [MIPS] Don't byteswap writes to display when running bigendian
---

c34c15b02e0af7e235f84ca1471747ee1cbb1b87