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)
1  2 
arch/powerpc/mm/fsl_booke_mmu.c
include/linux/pci_ids.h

Simple merge
Simple merge