From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Thu, 11 Feb 2010 22:01:46 +0000 (-0800)
Subject: Merge branch 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus
X-Git-Tag: v2.6.33-rc8~16
X-Git-Url: http://git.osdn.net/view?p=armadillo-ux%2Flinux-2.6-armadillo.git;a=commitdiff_plain;h=9883b83d6fb2f87e0eb6c8839325272466041577

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

* 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus:
  MIPS: Don't probe reserved EntryHi bits.
  MIPS: SNI: Correct NULL test
  MIPS: Fix __devinit __cpuinit confusion in cpu_cache_init
  MIPS: IP27: Make defconfig useful again.
  MIPS: Fixup of the r4k timer
---

9883b83d6fb2f87e0eb6c8839325272466041577