Merge branch 'pci/stephen-const' into next
authorBjorn Helgaas <bhelgaas@google.com>
Wed, 12 Sep 2012 19:54:10 +0000 (13:54 -0600)
committerBjorn Helgaas <bhelgaas@google.com>
Wed, 12 Sep 2012 19:54:10 +0000 (13:54 -0600)
commit1959ec5f82acbdf91425b41600f119ebecb5f6a8
treeb54bc758f10632e991a3a80a94b05f3940b6651c
parenta63ab613ff48c593f4e9ace2d111978e35a202e4
parent1d3520357df99baf4ad89f86268ac96cd38092d9
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
13 files changed:
drivers/infiniband/hw/qib/qib_pcie.c
drivers/net/ethernet/atheros/atl1c/atl1c_main.c
drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c
drivers/net/ethernet/broadcom/tg3.c
drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c
drivers/net/ethernet/intel/e1000e/netdev.c
drivers/net/ethernet/intel/igb/igb_main.c
drivers/net/ethernet/intel/ixgbe/ixgbe_main.c
drivers/net/ethernet/qlogic/netxen/netxen_nic_main.c
drivers/pci/pcie/aer/aerdrv.c
drivers/pci/pcie/aer/aerdrv_core.c
drivers/pci/pcie/portdrv_pci.c
include/linux/pci.h