Merge tag 'pci-v3.17-changes-2' of git://git.kernel.org/pub/scm/linux/kernel/git...
authorLinus Torvalds <torvalds@linux-foundation.org>
Fri, 15 Aug 2014 00:10:33 +0000 (18:10 -0600)
committerLinus Torvalds <torvalds@linux-foundation.org>
Fri, 15 Aug 2014 00:10:33 +0000 (18:10 -0600)
commita11c5c9ef6dc562fc7df7aaf7911569a85f4d71c
tree6e0a6c7a259287e201ab3e727c8d85286e93159a
parent179c0ac67b9d947d2de69e9f08a743e7c74a8dce
parent9baa3c34ac4e27f7e062f266f50cc5dbea26a6c1
Merge tag 'pci-v3.17-changes-2' of git://git./linux/kernel/git/helgaas/pci

Pull DEFINE_PCI_DEVICE_TABLE removal from Bjorn Helgaas:
 "Part two of the PCI changes for v3.17:

    - Remove DEFINE_PCI_DEVICE_TABLE macro use (Benoit Taine)

  It's a mechanical change that removes uses of the
  DEFINE_PCI_DEVICE_TABLE macro.  I waited until later in the merge
  window to reduce conflicts, but it's possible you'll still see a few"

* tag 'pci-v3.17-changes-2' of git://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci:
  PCI: Remove DEFINE_PCI_DEVICE_TABLE macro use
drivers/net/ethernet/broadcom/tg3.c
drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c
drivers/net/ethernet/emulex/benet/be_main.c
drivers/net/ethernet/intel/i40e/i40e_main.c
drivers/net/ethernet/mellanox/mlx4/main.c
drivers/net/ethernet/myricom/myri10ge/myri10ge.c
drivers/net/irda/donauboe.c
drivers/net/wan/wanxl.c
drivers/net/wireless/ipw2x00/ipw2200.c