diff options
| author | Sascha Hauer <s.hauer@pengutronix.de> | 2013-07-01 09:37:35 +0200 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2013-07-01 09:37:35 +0200 |
| commit | be1ebac4291ddbc6920e63d18ab92292528d1683 (patch) | |
| tree | 52eb678d4f602e94a5e8381e69b35f0827c32f8e /commands/Kconfig | |
| parent | 35faccbb1c7919a55cf56e5f403d9f697abaa0cf (diff) | |
| parent | dee6282fbfc974c4103895d1ccb1cffb3c0a3412 (diff) | |
| download | barebox-be1ebac4291ddbc6920e63d18ab92292528d1683.tar.gz barebox-be1ebac4291ddbc6920e63d18ab92292528d1683.tar.xz | |
Merge branch 'for-next/mci'
Conflicts:
arch/arm/boards/ccxmx51/ccxmx51js.c
arch/arm/boards/dmo-mx6-realq7/board.c
Diffstat (limited to 'commands/Kconfig')
0 files changed, 0 insertions, 0 deletions