Merge commit 'origin/master' into next

author Benjamin Herrenschmidt <[email protected]>

Mon, 15 Jun 2009 00:36:54 +0000 (10:36 +1000)

committer Benjamin Herrenschmidt <[email protected]>

Mon, 15 Jun 2009 00:36:54 +0000 (10:36 +1000)
author Benjamin Herrenschmidt <[email protected]>
Mon, 15 Jun 2009 00:36:54 +0000 (10:36 +1000)
committer Benjamin Herrenschmidt <[email protected]>
Mon, 15 Jun 2009 00:36:54 +0000 (10:36 +1000)
diff --cc Documentation/kernel-parameters.txt
Simple merge
diff --cc include/linux/pci_ids.h
Simple merge
author	Benjamin Herrenschmidt <[email protected]>
	Mon, 15 Jun 2009 00:36:54 +0000 (10:36 +1000)
committer	Benjamin Herrenschmidt <[email protected]>
	Mon, 15 Jun 2009 00:36:54 +0000 (10:36 +1000)
		1	2
Documentation/kernel-parameters.txt	patch \|	diff1 \|	diff2 \|	blob \| history
include/linux/pci_ids.h	patch \|	diff1 \|	diff2 \|	blob \| history