diff options
| author | Bjorn Helgaas <bhelgaas@google.com> | 2012-11-28 19:39:19 +0100 |
|---|---|---|
| committer | Bjorn Helgaas <bhelgaas@google.com> | 2012-11-28 19:39:19 +0100 |
| commit | 3c282db1656733c1267e6af4c22179bb04faf2ef (patch) | |
| tree | 141669ad06cfc2459ec93aeb9d86237328faa61d /Documentation/pi-futex.txt | |
| parent | Merge branch 'for-linus' into next (diff) | |
| parent | PCI/AER: Report success only when every device has AER-aware driver (diff) | |
| download | linux-3c282db1656733c1267e6af4c22179bb04faf2ef.tar.xz linux-3c282db1656733c1267e6af4c22179bb04faf2ef.zip | |
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
Diffstat (limited to 'Documentation/pi-futex.txt')
0 files changed, 0 insertions, 0 deletions