Merge branch 'pci/stephen-const' into next

* pci/stephen-const:
  make drivers with pci error handlers const
  scsi: make pci error handlers const
  netdev: make pci_error_handlers const
  PCI: Make pci_error_handlers const

diff --cc drivers/infiniband/hw/qib/qib_pcie.c
Simple merge

diff --cc drivers/net/ethernet/atheros/atl1c/atl1c_main.c
Simple merge

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

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

diff --cc drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c
Simple merge

diff --cc drivers/net/ethernet/intel/e1000e/netdev.c
Simple merge

diff --cc drivers/net/ethernet/intel/igb/igb_main.c
Simple merge

diff --cc drivers/net/ethernet/intel/ixgbe/ixgbe_main.c
Simple merge

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

diff --cc drivers/pci/pcie/aer/aerdrv.c
Simple merge

diff --cc drivers/pci/pcie/aer/aerdrv_core.c
Simple merge

diff --cc drivers/pci/pcie/portdrv_pci.c
Simple merge

diff --cc include/linux/pci.h
Simple merge