commit 3455229fd6a51978439f9c6256d677b745fad06b
author Linus Torvalds <torvalds@linux-foundation.org> Sat Nov 12 00:01:51 2011 -0200
committer Linus Torvalds <torvalds@linux-foundation.org> Sat Nov 12 00:01:51 2011 -0200
tree 44f3441d6063649ded4558ad027f3158487fa9ec
parent 732783fea085e3464c4ea4940dbb540ac8675e79
parent 5ccf55dd8177295813b68780f0a3c85e47306be1

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/kvm: Fix build failure with HV KVM and CBE
  powerpc/ps3: Fix lv1_gpu_attribute hcall
  powerpc/ps3: Fix PS3 repository build warnings
  powerpc/ps3: irq: Remove IRQF_DISABLED
  powerpc/irq: Remove IRQF_DISABLED
  powerpc/numa: NUMA topology support for PowerNV
  powerpc: Add System RAM to /proc/iomem
  powerpc: Add KVM as module to defconfigs
  powerpc/kvm: Fix build with older toolchains
  powerpc, tqm5200: update tqm5200_defconfig to fit for charon board.
  powerpc/5200: add support for charon board