Merge branch 'fortglx/3.11/time' of git://git.linaro.org/people/jstultz/linux into...
authorThomas Gleixner <tglx@linutronix.de>
Mon, 24 Jun 2013 23:30:51 +0000 (01:30 +0200)
committerThomas Gleixner <tglx@linutronix.de>
Mon, 24 Jun 2013 23:30:51 +0000 (01:30 +0200)

Trivial merge