Merge branch 'for-will/arch-timer-unification' of git://linux-arm.org/linux-mr into...
authorWill Deacon <will.deacon@arm.com>
Fri, 1 Feb 2013 10:28:36 +0000 (10:28 +0000)
committerWill Deacon <will.deacon@arm.com>
Fri, 1 Feb 2013 10:28:36 +0000 (10:28 +0000)
1  2 
arch/arm/Kconfig

Simple merge