]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
Merge branch 'next/pm' into for-next
authorArnd Bergmann <arnd@arndb.de>
Fri, 21 Oct 2011 14:41:07 +0000 (16:41 +0200)
committerArnd Bergmann <arnd@arndb.de>
Fri, 21 Oct 2011 14:41:07 +0000 (16:41 +0200)
1  2 
arch/arm/mach-prima2/timer.c

Simple merge