Merge commit 'origin/master' into next
commite14eee56c2280953c6e3d24d5dce42bd90836b81
authorBenjamin Herrenschmidt <benh@kernel.crashing.org>
Wed, 11 Mar 2009 06:10:07 +0000 (11 17:10 +1100)
committerBenjamin Herrenschmidt <benh@kernel.crashing.org>
Wed, 11 Mar 2009 06:10:07 +0000 (11 17:10 +1100)
tree21ab792d9ad6fbbab460058f352a0158f995644e
parentd6ee6f7e4c74d9a0fed7544f4d389bde004651d3
parent99adcd9d67aaf04e28f5ae96df280f236bde4b66
Merge commit 'origin/master' into next
arch/powerpc/sysdev/ppc4xx_pci.c
include/linux/pci_ids.h