projects
/
GitHub
/
LineageOS
/
G12
/
android_kernel_amlogic_linux-4.9.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
2cd59de
d2be00c
b7e7817
)
Merge branches 'pci/host-generic' and 'pci/host-versatile' into next
author
Bjorn Helgaas
<bhelgaas@google.com>
Mon, 2 Feb 2015 20:49:49 +0000
(14:49 -0600)
committer
Bjorn Helgaas
<bhelgaas@google.com>
Mon, 2 Feb 2015 20:49:49 +0000
(14:49 -0600)
* pci/host-generic:
of/pci: Free resources on failure in of_pci_get_host_bridge_resources()
* pci/host-versatile:
PCI: versatile: Add DT-based ARM Versatile PB PCIe host driver
ARM: dts: versatile: add PCI controller binding
PCI: versatile: Add DT docs for ARM Versatile PB PCIe driver
Trivial merge