Merge commit 'origin/master' into next
authorBenjamin Herrenschmidt <benh@kernel.crashing.org>
Wed, 9 Dec 2009 06:14:38 +0000 (17:14 +1100)
committerBenjamin Herrenschmidt <benh@kernel.crashing.org>
Wed, 9 Dec 2009 06:14:38 +0000 (17:14 +1100)
commitbcd6acd51f3d4d1ada201e9bc5c40a31d6d80c71
tree2f6dffd2d3e4dd67355a224de7e7a960335a92fd
parent11c34c7deaeeebcee342cbc35e1bb2a6711b2431
parent3ff6a468b45b5dfeb0e903e56f4eb27d34b2437c
Merge commit 'origin/master' into next

Conflicts:
include/linux/kvm.h
14 files changed:
Documentation/powerpc/dts-bindings/fsl/mpc5200.txt
MAINTAINERS
arch/powerpc/include/asm/hvcall.h
arch/powerpc/kernel/exceptions-64s.S
arch/powerpc/kernel/irq.c
arch/powerpc/kernel/setup_64.c
arch/powerpc/kernel/time.c
arch/powerpc/kernel/traps.c
arch/powerpc/kvm/powerpc.c
drivers/ata/Kconfig
drivers/ata/Makefile
include/linux/kvm.h
include/linux/pci_ids.h
virt/kvm/kvm_main.c