Merge branch 'master' of github.com:davem330/net

Conflicts: net/batman-adv/soft-interface.c
2011-10-07 13:38:43 -04:00
parent 8083f0fc96 3ee72ca992
commit 88c5100c28
178 changed files with 1255 additions and 1000 deletions
--- a/include/linux/pci.h
+++ b/include/linux/pci.h
@@ -623,8 +623,9 @@ struct pci_driver {
 extern void pcie_bus_configure_settings(struct pci_bus *bus, u8 smpss);

 enum pcie_bus_config_types {
-	PCIE_BUS_PERFORMANCE,
+	PCIE_BUS_TUNE_OFF,
 	PCIE_BUS_SAFE,
+	PCIE_BUS_PERFORMANCE,
 	PCIE_BUS_PEER2PEER,
 };