From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Mon, 1 Feb 2010 18:37:58 +0000 (-0800)
Subject: Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc
X-Git-Tag: v3.0~6118
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=32337f8a7020676b5fd6387def9ccb9060440c5c;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:
  powerpc: TIF_ABI_PENDING bit removal
  powerpc/pseries: Fix xics build without CONFIG_SMP
  powerpc/4xx: Add pcix type 1 transactions
  powerpc/pci: Add missing call to header fixup
  powerpc/pci: Add missing hookup to pci_slot
  powerpc/pci: Add calls to set_pcie_port_type() and set_pcie_hotplug_bridge()
  powerpc/40x: Update the PowerPC 40x board defconfigs
  powerpc/44x: Update PowerPC 44x board defconfigs
---

32337f8a7020676b5fd6387def9ccb9060440c5c