Merge commit 'origin/master' into next
authorBenjamin Herrenschmidt <benh@kernel.crashing.org>
Tue, 24 Nov 2009 06:16:30 +0000 (17:16 +1100)
committerBenjamin Herrenschmidt <benh@kernel.crashing.org>
Tue, 24 Nov 2009 06:16:30 +0000 (17:16 +1100)
1  2 
include/linux/pci_ids.h

Simple merge