| commit | 3c282db1656733c1267e6af4c22179bb04faf2ef | [log] [tgz] |
|---|---|---|
| author | Bjorn Helgaas <bhelgaas@google.com> | Wed Nov 28 11:39:19 2012 -0700 |
| committer | Bjorn Helgaas <bhelgaas@google.com> | Wed Nov 28 11:39:19 2012 -0700 |
| tree | 141669ad06cfc2459ec93aeb9d86237328faa61d | |
| parent | d3fe3988fb24e5ed13b2243b789a652882d3b26c [diff] | |
| parent | 918b4053184c0ca22236e70e299c5343eea35304 [diff] |
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