projects / linux.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 46bdfe6 081d835)
Merge branch 'upstream' of git://git.linux-mips.org/pub/scm/upstream-linus
authorLinus Torvalds <torvalds@linux-foundation.org>
Sat, 18 Dec 2010 18:23:29 +0000 (10:23 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Sat, 18 Dec 2010 18:23:29 +0000 (10:23 -0800)
* 'upstream' of git://git.linux-mips.org/pub/scm/upstream-linus:
  MIPS: Fix build errors in sc-mips.c


Trivial merge
Linux Kernel tree with some unpolished code for Colibri/Apalis modules