diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2012-03-20 22:40:37 +0000 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2012-03-20 22:40:37 +0000 |
| commit | 7cc026f21e2acdcea8640df5da470c6fdca92911 (patch) | |
| tree | 6f3caa790f02378868876ad3d78203680e9372e7 /arch/mips/jazz | |
| parent | 6307e418251240c2d18b3d69b96e50176c51a113 (diff) | |
| parent | b1f91a9ce335eb4e0fef17c10f39a438ac3fce9b (diff) | |
Merge branch 'imx/defconfig' into next/drivers
Conflicts:
arch/arm/configs/imx_v6_v7_defconfig
Resolves one conflict with an earlier branch
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'arch/mips/jazz')
0 files changed, 0 insertions, 0 deletions