Merge branch 'pci/misc' into next
authorBjorn Helgaas <bhelgaas@google.com>
Wed, 28 Nov 2012 18:39:19 +0000 (11:39 -0700)
committerBjorn Helgaas <bhelgaas@google.com>
Wed, 28 Nov 2012 18:39:19 +0000 (11:39 -0700)
commit3c282db1656733c1267e6af4c22179bb04faf2ef
tree141669ad06cfc2459ec93aeb9d86237328faa61d
parentd3fe3988fb24e5ed13b2243b789a652882d3b26c
parent918b4053184c0ca22236e70e299c5343eea35304
Merge branch 'pci/misc' into next

* pci/misc:
  PCI/AER: Report success only when every device has AER-aware driver

Conflicts:
drivers/pci/pcie/aer/aerdrv_core.c
drivers/pci/pcie/aer/aerdrv_core.c
include/linux/pci.h