projects / openwrt / staging / blogic.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: a4b4df2 5b7efa8)
Merge branch 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus
authorLinus Torvalds <torvalds@linux-foundation.org>
Thu, 11 Feb 2010 22:01:46 +0000 (14:01 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Thu, 11 Feb 2010 22:01:46 +0000 (14:01 -0800)
commit9883b83d6fb2f87e0eb6c8839325272466041577
treea61cede09f8c47016af954311a8ed248bf4d2f34tree | snapshot
parenta4b4df279471ec360de11ec86640fd8a3c533487commit | diff
parent5b7efa898b357e6ebe4024c520e62024eb969b5fcommit | diff
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
John Crispins staging tree