Merge branch 'pci/bjorn-remove-fakephp' into next
authorBjorn Helgaas <bhelgaas@google.com>
Thu, 6 Sep 2012 22:14:19 +0000 (16:14 -0600)
committerBjorn Helgaas <bhelgaas@google.com>
Thu, 6 Sep 2012 22:14:19 +0000 (16:14 -0600)
commitbe017b255eca3db94f6f62f20d05abc6bffab7ee
tree8bf8b3813d1ef52a954bdf0cd2722a3e95487de9
parent7bf79d8a9904ee1ed354e7e655f8045afda67fd6
parentc2b5acc3a3ba80bef61b9df712004e83cbab4a11
Merge branch 'pci/bjorn-remove-fakephp' into next

* pci/bjorn-remove-fakephp:
  PCI: Remove the fakephp driver