From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Wed, 3 Sep 2014 15:45:48 +0000 (-0700)
Subject: Merge tag 'pci-v3.17-fixes-1' of git://git.kernel.org/pub/scm/linux/kernel/git/helgaa... 
X-Git-Tag: v3.17-rc4~31
X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=commitdiff_plain;h=f16c15a0e0ea88d95b49467a90f71017604e6a5d;p=linux.git

Merge tag 'pci-v3.17-fixes-1' of git://git.kernel.org/pub/scm/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
---

f16c15a0e0ea88d95b49467a90f71017604e6a5d