Merge branch 'imx/defconfig' into next/drivers
authorArnd Bergmann <arnd@arndb.de>
Tue, 20 Mar 2012 22:40:37 +0000 (22:40 +0000)
committerArnd Bergmann <arnd@arndb.de>
Tue, 20 Mar 2012 22:40:37 +0000 (22:40 +0000)
commit7cc026f21e2acdcea8640df5da470c6fdca92911
tree6f3caa790f02378868876ad3d78203680e9372e7
parent6307e418251240c2d18b3d69b96e50176c51a113
parentb1f91a9ce335eb4e0fef17c10f39a438ac3fce9b
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>
arch/arm/configs/imx_v6_v7_defconfig