diff options
author | Bjorn Helgaas <bhelgaas@google.com> | 2014-09-04 14:20:25 -0600 |
---|---|---|
committer | Bjorn Helgaas <bhelgaas@google.com> | 2014-09-04 14:20:25 -0600 |
commit | fd7155fc9fca6464a5aa668965a3741b963f805f (patch) | |
tree | de09c4ec9710c207118fac0cd4ab52fde2f1d856 /fs/udf/ialloc.c | |
parent | 52addcf9d6669fa439387610bc65c92fa0980cef (diff) | |
parent | 3e3e406e3807235906ee0b7c697664ea6dfd88de (diff) |
Merge branch 'pci/host-imx6' into for-linus
* pci/host-imx6:
PCI: imx6: Put LTSSM in "Detect" state before disabling it
MAINTAINERS: Add Lucas Stach as co-maintainer for i.MX6 PCI driver
Diffstat (limited to 'fs/udf/ialloc.c')
0 files changed, 0 insertions, 0 deletions