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)
commit1e43bee9c70654b4d52472c19e5f0a0cc18b6b36
treeff601ec0c0d14125d0324f21b3c7e6d5e19fa252
parent7d6709a20866a885916214590b7c394a21be9e25
parenta8a8a669ea13d792296737505adc43ccacf3a648
Merge commit 'origin/master' into next
include/linux/pci_ids.h