Merge branch 'fortglx/3.10/time' of git://git.linaro.org/people/jstultz/linux into...
authorThomas Gleixner <tglx@linutronix.de>
Wed, 3 Apr 2013 10:27:29 +0000 (12:27 +0200)
committerThomas Gleixner <tglx@linutronix.de>
Wed, 3 Apr 2013 10:27:29 +0000 (12:27 +0200)
commit0ed2aef9b3bffe598045b62a31a50d912eee92d8
treed7dda12955c838f531727d2775d09c4e04bdf066
parentcfea7d7e452f57682a0bb55a55e9f79c569558c2
parent8011657b9e63cb2e914b9a0f75233b910c1854cb
Merge branch 'fortglx/3.10/time' of git://git.linaro.org/people/jstultz/linux into timers/core
kernel/hrtimer.c
kernel/time/tick-internal.h