git.openpandora.org
/
pandora-kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
d3fe398
918b405
)
Merge branch 'pci/misc' into next
author
Bjorn Helgaas
<bhelgaas@google.com>
Wed, 28 Nov 2012 18:39:19 +0000
(11:39 -0700)
committer
Bjorn Helgaas
<bhelgaas@google.com>
Wed, 28 Nov 2012 18:39:19 +0000
(11:39 -0700)
* pci/misc:
PCI/AER: Report success only when every device has AER-aware driver
Conflicts:
drivers/pci/pcie/aer/aerdrv_core.c
Trivial merge
git.openpandora.org / pandora-kernel.git / commitdiff