]> pilppa.com Git - linux-2.6-omap-h63xx.git/commitdiff
Merge commit 'origin/master' into next
authorBenjamin Herrenschmidt <benh@kernel.crashing.org>
Wed, 11 Mar 2009 06:10:07 +0000 (17:10 +1100)
committerBenjamin Herrenschmidt <benh@kernel.crashing.org>
Wed, 11 Mar 2009 06:10:07 +0000 (17:10 +1100)
1  2 
arch/powerpc/sysdev/ppc4xx_pci.c
include/linux/pci_ids.h

Simple merge
Simple merge