diff options
| author | Bjorn Helgaas <bhelgaas@google.com> | 2017-02-22 00:14:53 +0300 |
|---|---|---|
| committer | Bjorn Helgaas <bhelgaas@google.com> | 2017-02-22 00:14:53 +0300 |
| commit | e34e38bf891bd7bf7c9305ff1d2e1b29a77dd159 (patch) | |
| tree | ac5c02d6feccd81a28df27e5b4f82eeaeed41d06 /kernel/time/timer_stats.c | |
| parent | 5dcda98a3b7cfc0025ca49a700765ac9ba78a6a7 (diff) | |
| parent | 21b7245034aa83c80fb8d0011e18d597a62a91f1 (diff) | |
| download | linux-e34e38bf891bd7bf7c9305ff1d2e1b29a77dd159.tar.xz | |
Merge branch 'pci/host-imx6' into next
* pci/host-imx6:
PCI: imx6: Fix a typo in error message
PCI: imx6: Remove LTSSM disable workaround
PCI: imx6: Remove redundant "Link never came up" message
Conflicts:
drivers/pci/dwc/pci-imx6.c
Diffstat (limited to 'kernel/time/timer_stats.c')
0 files changed, 0 insertions, 0 deletions