summaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorSascha Hauer <s.hauer@pengutronix.de>2014-02-03 09:55:41 +0100
committerSascha Hauer <s.hauer@pengutronix.de>2014-02-03 09:55:41 +0100
commit4a53361beb278b110d1b73ca71398ecb7de54fed (patch)
treee69ce171a23c07571278605c415e5d90e088e205 /drivers
parentc224cd316197132321869d859048f89da49c0162 (diff)
parentf986b957354949eca175d8190d79a4506ad6be62 (diff)
downloadbarebox-4a53361beb278b110d1b73ca71398ecb7de54fed.tar.gz
barebox-4a53361beb278b110d1b73ca71398ecb7de54fed.tar.xz
Merge branch 'for-next/iomem'
Conflicts: arch/arm/mach-imx/external-nand-boot.c
Diffstat (limited to 'drivers')
0 files changed, 0 insertions, 0 deletions