]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge branch 'next/timer' into for-next
authorArnd Bergmann <arnd@arndb.de>
Sat, 8 Oct 2011 19:57:09 +0000 (21:57 +0200)
committerArnd Bergmann <arnd@arndb.de>
Sat, 8 Oct 2011 19:57:09 +0000 (21:57 +0200)
commitfef0157b3d43df97ea130e65109bb0b12f290c83
treee947019c727c9556d045abfc56319a381cedeee8
parent55538041e4b3509f5e194bdecf283683c7d668f4
parentb1e3be0647fec81887e55edbda0c56c0445f7b53
Merge branch 'next/timer' into for-next

Conflicts:
arch/arm/mach-ux500/Makefile
arch/arm/mach-ux500/cpu.c
arch/arm/mach-ux500/Makefile
arch/arm/mach-ux500/cpu.c