Merge branch 'pci/yinghai-misc' into next
authorBjorn Helgaas <bhelgaas@google.com>
Mon, 24 Sep 2012 23:24:11 +0000 (17:24 -0600)
committerBjorn Helgaas <bhelgaas@google.com>
Mon, 24 Sep 2012 23:24:11 +0000 (17:24 -0600)

Trivial merge