Merge tag 'pci-v3.17-fixes-1' of git://git.kernel.org/pub/scm/linux/kernel/git/helgaa...
authorLinus Torvalds <torvalds@linux-foundation.org>
Wed, 3 Sep 2014 15:45:48 +0000 (08:45 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Wed, 3 Sep 2014 15:45:48 +0000 (08:45 -0700)
commitf16c15a0e0ea88d95b49467a90f71017604e6a5d
treee13699daa88727f9318afd82dfde4572e1977084
parent51fe4d3baeaa976ca71e228f09950a960d4f7430
parent8d7004a6904cf089e0ebfe5a27e9674cee5db9dc
Merge tag 'pci-v3.17-fixes-1' of git://git./linux/kernel/git/helgaas/pci

Pull PCI fix from Bjorn Helgaas:
 "This fixes an ARM allmodconfig build problem:

  Remove module option for ST Microelectronics SPEAr13xx"

* tag 'pci-v3.17-fixes-1' of git://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci:
  PCI: spear: Remove module option
drivers/pci/host/Kconfig