summaryrefslogtreecommitdiff
path: root/drivers/pci/fsl_pci_init.c
diff options
context:
space:
mode:
authorTom Rini <trini@ti.com>2012-10-19 18:23:38 -0700
committerTom Rini <trini@ti.com>2012-10-19 18:23:38 -0700
commit99070db0dc0b0e881841a0091f06d53351244a34 (patch)
treef54a53d89cf1125c8fe433bc51539144de43074c /drivers/pci/fsl_pci_init.c
parent7f14f30a6d6c80f9fbe3fd8d5b0c294575e3094e (diff)
parent39826f09978a0a7070999acc15babf88f03e4051 (diff)
Merge branch 'master' of git://git.denx.de/u-boot-arm
Conflicts: drivers/serial/serial_lh7a40x.c Signed-off-by: Tom Rini <trini@ti.com>
Diffstat (limited to 'drivers/pci/fsl_pci_init.c')
0 files changed, 0 insertions, 0 deletions