Merge branch 'fortglx/3.4/clocksource' of git://git.linaro.org/people/jstultz/linux...
Thomas Gleixner [Wed, 15 Feb 2012 19:28:08 +0000 (20:28 +0100)]

Trivial merge