Merge commit 'origin/master' into next
commit7dafd239ab522d38979ebe44d79aa68ad7b1a383
authorBenjamin Herrenschmidt <benh@kernel.crashing.org>
Mon, 15 Jun 2009 00:36:54 +0000 (15 10:36 +1000)
committerBenjamin Herrenschmidt <benh@kernel.crashing.org>
Mon, 15 Jun 2009 00:36:54 +0000 (15 10:36 +1000)
tree04754a0c6495e57c1fe5f417fbfc99272d353c0e
parentbc47ab0241c7c86da4f5e5f82fbca7d45387c18d
parent45e3e1935e2857c54783291107d33323b3ef33c8
Merge commit 'origin/master' into next
Documentation/kernel-parameters.txt
include/linux/pci_ids.h