diff options
| author | Bjorn Helgaas <bhelgaas@google.com> | 2015-08-24 14:15:05 -0500 |
|---|---|---|
| committer | Bjorn Helgaas <bhelgaas@google.com> | 2015-08-24 14:15:05 -0500 |
| commit | 2fc32c92593dd7900c0635398800214733b8b397 (patch) | |
| tree | 14ddaf259daabd48d0f1c2aac819bb0f339b6997 | |
| parent | f0d9ac7510ee06162c9db31851a1169ae716867e (diff) | |
| parent | d3f4caa355c1c9d2ce7fd3da88e2be37836323db (diff) | |
| parent | 8d1ceb52e110aec808d64973f90fe4f69a5e42e9 (diff) | |
| parent | 68ebb7ce395c6d8ca99163911ec384853d4f88ad (diff) | |
Merge branches 'pci/host-dra7xx', 'pci/host-imx6' and 'pci/host-spear' into next
* pci/host-dra7xx:
PCI: dra7xx: Remove unneeded use of IS_ERR_VALUE()
* pci/host-imx6:
PCI: imx6: Simplify a trivial if-return sequence
* pci/host-spear:
PCI: spear: Use BUG_ON() instead of condition followed by BUG()