From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Tue, 3 Feb 2009 03:26:44 +0000 (-0800)
Subject: Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc
X-Git-Tag: v3.0~10723
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=93bfbd71db4d2e01c05e219f285249a74808b1d4;p=platform%2Fkernel%2Flinux-amlogic.git

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

93bfbd71db4d2e01c05e219f285249a74808b1d4