Merge branch 'fortglx/3.4/time' of git://git.linaro.org/people/jstultz/linux into...
authorThomas Gleixner <tglx@linutronix.de>
Wed, 15 Feb 2012 19:29:18 +0000 (20:29 +0100)
committerThomas Gleixner <tglx@linutronix.de>
Wed, 15 Feb 2012 19:29:18 +0000 (20:29 +0100)

Trivial merge