]> git.karo-electronics.de Git - karo-tx-linux.git/commit
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)
commit9b3ace973e4e054643955bfc4749b7fd50aaf67e
treedda03339cdac599c76f6ccbbe700ea18a8daa80a
parentaef6958e88dbfa7f65d7ce69edbee0df1714d9c6
parent2558bd99cb1426a05ac8f1c78dc9c75a83ceb4bb
Merge branch 'next/pm' into for-next
arch/arm/mach-prima2/timer.c