Merge commit 'kumar/next' into next
authorBenjamin Herrenschmidt <benh@kernel.crashing.org>
Wed, 11 Feb 2009 02:37:44 +0000 (13:37 +1100)
committerBenjamin Herrenschmidt <benh@kernel.crashing.org>
Wed, 11 Feb 2009 02:37:44 +0000 (13:37 +1100)
commitedbc29d76ddbc9bd56e1cbc772188f70c616ffe1
tree71b994ba493c46e10189c090fd17fe2da80281ec
parent1db8508cf483dc1ecf66141f90a7c03659d69512
parenta0e8618c71b9b685977c1407dee928d86c5bdc2c
Merge commit 'kumar/next' into next
arch/powerpc/mm/fsl_booke_mmu.c
include/linux/pci_ids.h