Skip to content

Commit

Permalink
Merge branch 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-…
Browse files Browse the repository at this point in the history 
…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
  • Loading branch information
Linus Torvalds committed Feb 11, 2010
2 parents a4b4df2 + 5b7efa8 commit 9883b83
Show file tree
Hide file tree
Showing 6 changed files with 736 additions and 194 deletions.
Loading

0 comments on commit 9883b83

Please sign in to comment.