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)
commit6fdf5e67fe8d3c83500dad9acae985132c2459a3
treec6cb9c0b22c4d22e4c65a40c0851aff5eedf7cd5
parentabd24df828f1a72971db29d1b74fefae104ea9e2
parente64a3cfcd929d093a2f076bcace9afa7ba5a2e32
Merge branch 'upstream' of git://git./linux/kernel/git/ralf/upstream-linus

* '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