From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Fri, 4 Apr 2008 22:09:44 +0000 (-0700)
Subject: Merge branch 'upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/ralf/upstrea... 
X-Git-Tag: v2.6.25-rc9~62
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=6fdf5e67fe8d3c83500dad9acae985132c2459a3;p=linux-2.6-omap-h63xx.git

Merge branch 'upstream' of git://git.kernel.org/pub/scm/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
---

6fdf5e67fe8d3c83500dad9acae985132c2459a3