Merge commit 'kumar/next' into next

author Benjamin Herrenschmidt <[email protected]>

Wed, 11 Feb 2009 02:37:44 +0000 (13:37 +1100)

committer Benjamin Herrenschmidt <[email protected]>

Wed, 11 Feb 2009 02:37:44 +0000 (13:37 +1100)
author Benjamin Herrenschmidt <[email protected]>
Wed, 11 Feb 2009 02:37:44 +0000 (13:37 +1100)
committer Benjamin Herrenschmidt <[email protected]>
Wed, 11 Feb 2009 02:37:44 +0000 (13:37 +1100)
diff --cc arch/powerpc/mm/fsl_booke_mmu.c
Simple merge
diff --cc include/linux/pci_ids.h
Simple merge
author	Benjamin Herrenschmidt <[email protected]>
	Wed, 11 Feb 2009 02:37:44 +0000 (13:37 +1100)
committer	Benjamin Herrenschmidt <[email protected]>
	Wed, 11 Feb 2009 02:37:44 +0000 (13:37 +1100)
		1	2
arch/powerpc/mm/fsl_booke_mmu.c	patch \|	diff1 \|	diff2 \|	blob \| history
include/linux/pci_ids.h	patch \|	diff1 \|	diff2 \|	blob \| history