Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc
authorLinus Torvalds <torvalds@linux-foundation.org>
Tue, 3 Feb 2009 03:26:44 +0000 (19:26 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Tue, 3 Feb 2009 03:26:44 +0000 (19:26 -0800)
commit93bfbd71db4d2e01c05e219f285249a74808b1d4
tree43f38899aaa2af9169146b6523d094be299ccc60
parent31c952dcf83d5b0fd57b514cbe8a1664647c26e7
parent7fbb7cadd062baf299fd8b26a80ea99da0c3fe01
Merge branch 'merge' of git://git./linux/kernel/git/benh/powerpc

* 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc:
  fbdev/atyfb: Fix DSP config on some PowerMacs & PowerBooks
  powerpc: Fix oops on some machines due to incorrect pr_debug()
  powerpc/ps3: Printing fixups for l64 to ll64 convserion drivers/net
  powerpc/5200: update device tree binding documentation
  powerpc/5200: Bugfix for PCI mapping of memory and IMMR
  powerpc/5200: update defconfigs