Merge branch 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus
authorLinus Torvalds <torvalds@linux-foundation.org>
Thu, 28 Jan 2010 20:59:43 +0000 (12:59 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Thu, 28 Jan 2010 20:59:43 +0000 (12:59 -0800)
commitd4d37bde3d036cfce240c12144ea9e80ce3ee5d0
tree858277db13a3b6a0522ee58c2e1e13fefb4f90f2
parent551e28dbe82f9de58993d7587201a2569b942341
parent010c108d7af708d9e09b83724a058a76803fbc66
Merge branch 'upstream' of git://ftp.linux-mips.org/upstream-linus

* 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus:
  MIPS: PowerTV: Fix support for timer interrupts with > 64 external IRQs
  MIPS: PowerTV: Streamline access to platform device registers
  MIPS: Fix vmlinuz build for 32bit-only math shells
  MIPS: Add support of LZO-compressed kernels