diff options
| author | Bjorn Helgaas <bhelgaas@google.com> | 2016-08-01 12:25:37 -0500 |
|---|---|---|
| committer | Bjorn Helgaas <bhelgaas@google.com> | 2016-08-01 12:25:37 -0500 |
| commit | ea1f4e9d1daf87c08ec399669300ee5d1fb68e89 (patch) | |
| tree | c4eeb0293b9933b588b4672c1fcc1d770b88ae24 /net/ipv6 | |
| parent | 79dd99346166bcbf3b082f6e234db788da1db3c9 (diff) | |
| parent | f814430c3ec89177f5d530484c4df95c268aedfb (diff) | |
| download | linux-ea1f4e9d1daf87c08ec399669300ee5d1fb68e89.tar.bz2 | |
Merge branch 'pci/host-tegra' into next
* pci/host-tegra:
PCI: tegra: Program PADS_REFCLK_CFG* registers with per-SoC values
PCI: tegra: Program PADS_REFCLK_CFG* always, not just on legacy SoCs
PCI: tegra: Stop setting pcibios_min_mem
PCI: tegra: Use generic pci_remap_iospace() rather than ARM32-specific one
PCI: tegra: Use lower-case hex consistently for register definitions
Conflicts:
drivers/pci/host/pci-tegra.c
Drop stray pci_ioremap_io() per Thierry Reding <treding@nvidia.com>;
removal tested by Jon Hunter <jonathanh@nvidia.com>.
Diffstat (limited to 'net/ipv6')
0 files changed, 0 insertions, 0 deletions