Merge commit 'origin/master' into next
authorBenjamin Herrenschmidt <benh@kernel.crashing.org>
Fri, 12 Jun 2009 06:53:38 +0000 (16:53 +1000)
committerBenjamin Herrenschmidt <benh@kernel.crashing.org>
Fri, 12 Jun 2009 06:53:38 +0000 (16:53 +1000)
commitbc47ab0241c7c86da4f5e5f82fbca7d45387c18d
treeb9c33ae8b6de43e44cc5fcbaa3e4a15f18a5ed42
parent37f9ef553bed630957e025504cdcbc76f5de49d5
parent8ebf975608aaebd7feb33d77f07ba21a6380e086
Merge commit 'origin/master' into next

Manual merge of:
arch/powerpc/kernel/asm-offsets.c
Documentation/kernel-parameters.txt
arch/powerpc/include/asm/paca.h
arch/powerpc/kernel/Makefile
arch/powerpc/kernel/asm-offsets.c
arch/powerpc/kernel/irq.c
arch/powerpc/platforms/Kconfig.cputype
arch/powerpc/sysdev/mpic.c
include/linux/pci_ids.h