Merge branch 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus
commitc34c15b02e0af7e235f84ca1471747ee1cbb1b87
authorLinus Torvalds <torvalds@woody.linux-foundation.org>
Tue, 11 Dec 2007 03:45:17 +0000 (10 19:45 -0800)
committerLinus Torvalds <torvalds@woody.linux-foundation.org>
Tue, 11 Dec 2007 03:45:17 +0000 (10 19:45 -0800)
treeea6a40c40601e8a1af8c21cd537340179427732d
parent3790ee4bd86396558eedd86faac1052cb782e4e1
parentba0f00b9fcb02b10cc9929fec660f86d1af6a41a
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