Merge commit 'origin/master' into next
Benjamin Herrenschmidt [Mon, 15 Jun 2009 00:36:54 +0000 (10:36 +1000)]
1  2 
Documentation/kernel-parameters.txt
include/linux/pci_ids.h

Simple merge
Simple merge