diff options
| author | Sascha Hauer <s.hauer@pengutronix.de> | 2012-04-24 10:38:23 +0200 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2012-04-24 10:38:23 +0200 |
| commit | ba361ee78f915aa9e26acbbdf6f57712c69506d2 (patch) | |
| tree | 60fb18386ba11f4b8653133abbf630e98aa2f8f6 /include/binfmt.h | |
| parent | b108afa01ac0ceb72db750fefd32a67c0247c9ca (diff) | |
| parent | fd9c7d412ee7ff7b351be35afa01ccfc48404080 (diff) | |
| download | barebox-ba361ee78f915aa9e26acbbdf6f57712c69506d2.tar.gz barebox-ba361ee78f915aa9e26acbbdf6f57712c69506d2.tar.xz | |
Merge branch 'pu/mx6-v2' into next
Conflicts:
arch/arm/Makefile
arch/arm/mach-imx/Kconfig
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Diffstat (limited to 'include/binfmt.h')
0 files changed, 0 insertions, 0 deletions