]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge branch 'next/driver' into for-next
authorArnd Bergmann <arnd@arndb.de>
Sat, 8 Oct 2011 19:56:32 +0000 (21:56 +0200)
committerArnd Bergmann <arnd@arndb.de>
Sat, 8 Oct 2011 19:56:32 +0000 (21:56 +0200)
commit55538041e4b3509f5e194bdecf283683c7d668f4
tree867ad11fc0ef92fdf08f6ae822150ed182486312
parent2af55a7797dd8c8fad44cf3f7fcbd1acc0304597
parent318007e9001349db9b4fcd49e9e79a7636dba7a9
Merge branch 'next/driver' into for-next

Conflicts:
arch/arm/mach-mx5/Kconfig
arch/arm/mach-mx5/Kconfig
arch/arm/mach-mx5/clock-mx51-mx53.c
arch/arm/mach-mx5/devices-imx51.h
arch/arm/mach-mx5/mx51_efika.c
arch/arm/plat-mxc/devices/Kconfig