Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc
authorLinus Torvalds <torvalds@woody.linux-foundation.org>
Mon, 3 Dec 2007 16:23:58 +0000 (08:23 -0800)
committerLinus Torvalds <torvalds@woody.linux-foundation.org>
Mon, 3 Dec 2007 16:23:58 +0000 (08:23 -0800)
commitf589b86d4b6e067b720a253bdb40896857804037
treea0eaff20e2d43b424d4c760ff227b4a47f602044
parentc8b1ef88d09961078d3c685fcdc1d1659db05231
parentb80fa3cce7390185e43ea22e9b3c38ab138bc580
Merge branch 'merge' of git://git./linux/kernel/git/paulus/powerpc

* 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc:
  [POWERPC] Remove xmon from ml300 and ml403 defconfig in arch/ppc
  Revert "[POWERPC] Fix RTAS os-term usage on kernel panic"