diff options
| author |   Thomas Gleixner <tglx@linutronix.de> | 2013-02-04 11:03:03 +0100 |
|---|---|---|
| committer | Thomas Gleixner <tglx@linutronix.de> | 2013-02-04 11:03:03 +0100 |
| commit | 90889a635a9b5488624bccce3ff6b2eec68c007b (patch) | |
| tree | 8ddde1e04060bd65ca2aafb09b38066cb7d69b4d /kernel/hrtimer.c | |
| parent | Merge branch 'timers/for-arm' into timers/core (diff) | |
| parent | timekeeping: Switch HAS_PERSISTENT_CLOCK to ALWAYS_USE_PERSISTENT_CLOCK (diff) | |
| download | linux-dev-90889a635a9b5488624bccce3ff6b2eec68c007b.tar.xz linux-dev-90889a635a9b5488624bccce3ff6b2eec68c007b.zip | |
Merge branch 'fortglx/3.9/time' of git://git.linaro.org/people/jstultz/linux into timers/core
Trivial conflict in arch/x86/Kconfig
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Diffstat (limited to 'kernel/hrtimer.c')
0 files changed, 0 insertions, 0 deletions