diff options
author | Sascha Hauer <s.hauer@pengutronix.de> | 2012-11-16 14:02:32 +0100 |
---|---|---|
committer | Sascha Hauer <s.hauer@pengutronix.de> | 2012-11-16 14:02:32 +0100 |
commit | 9749c2f16f61048a66a98a95b6a1e88d4f491cf0 (patch) | |
tree | 529b4a220e337e6450d810b88c49c08c32f65ed6 /arch/arm/boards/freescale-mx28-evk | |
parent | 856f60dbd157126241cf9033514137849bb5ca22 (diff) | |
parent | 4104dd917388943f5b0ae87d1360738675c338b0 (diff) | |
download | barebox-9749c2f16f61048a66a98a95b6a1e88d4f491cf0.tar.gz barebox-9749c2f16f61048a66a98a95b6a1e88d4f491cf0.tar.xz |
Merge branch 'for-next/mtd'
Conflicts:
arch/arm/configs/at91sam9x5ek_defconfig
Diffstat (limited to 'arch/arm/boards/freescale-mx28-evk')
0 files changed, 0 insertions, 0 deletions