From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Thu, 28 Jan 2010 20:59:43 +0000 (-0800)
Subject: Merge branch 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus
X-Git-Tag: v3.12-rc1~11477
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=d4d37bde3d036cfce240c12144ea9e80ce3ee5d0;p=kernel%2Fkernel-generic.git

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

d4d37bde3d036cfce240c12144ea9e80ce3ee5d0