Merge remote-tracking branch 'pci/next'

diff --cc drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c
Simple merge

diff --cc drivers/net/ethernet/intel/e1000/e1000_main.c
Simple merge

diff --cc drivers/net/ethernet/mellanox/mlx4/main.c
Simple merge

diff --cc drivers/net/ethernet/qlogic/netxen/netxen_nic_main.c
Simple merge