tree a61cede09f8c47016af954311a8ed248bf4d2f34
parent a4b4df279471ec360de11ec86640fd8a3c533487
parent 5b7efa898b357e6ebe4024c520e62024eb969b5f
author Linus Torvalds <torvalds@linux-foundation.org> 1265925706 -0800
committer Linus Torvalds <torvalds@linux-foundation.org> 1265925706 -0800

Merge branch 'upstream' of git://ftp.linux-mips.org/pub/scm/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