commit 32337f8a7020676b5fd6387def9ccb9060440c5c
author Linus Torvalds <torvalds@linux-foundation.org> Mon Feb 01 10:37:58 2010 -0800
committer Linus Torvalds <torvalds@linux-foundation.org> Mon Feb 01 10:37:58 2010 -0800
tree 7688f053cc9a3be1e99a492c33b85473cd57c859
parent abe94c756c08d50566c09a65b9c7fe72f83071c5
parent 94f28da8409c6059135e89ac64a0839993124155

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