git.openpandora.org / pandora-kernel.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: abd24df e64a3cf)
Merge branch 'upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/ralf/upstrea...
authorLinus Torvalds <torvalds@linux-foundation.org>
Fri, 4 Apr 2008 22:09:44 +0000 (15:09 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Fri, 4 Apr 2008 22:09:44 +0000 (15:09 -0700)
* 'upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/ralf/upstream-linus:
  [MIPS] Make KGDB compile on UP
  [MIPS] Pb1200: Fix header breakage


Trivial merge
Pandora Kernel Repository