]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge branch 'heads/fixes' into for-next
authorArnd Bergmann <arnd@arndb.de>
Wed, 27 Mar 2013 21:37:45 +0000 (22:37 +0100)
committerArnd Bergmann <arnd@arndb.de>
Wed, 27 Mar 2013 21:37:45 +0000 (22:37 +0100)
commit94c97af463734d69222815c59919639e288bf834
tree4d0f7e4282306169b6821966626785db8a02e127
parentdb6f62a504a217c3eb2d8f51c4edd43d3d9ecd94
parentcba26c5ab991768cb7c2d6e96952f1226818fb41
Merge branch 'heads/fixes' into for-next

Conflicts:
arch/arm/boot/dts/dbx5x0.dtsi
arch/arm/Kconfig
arch/arm/boot/dts/dbx5x0.dtsi
arch/arm/mach-omap2/timer.c
arch/arm/mach-ux500/board-mop500.c
arch/arm/mach-ux500/cpu-db8500.c