projects / GitHub / LineageOS / G12 / android_kernel_amlogic_linux-4.9.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: cfea7d7 8011657)
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)
1  2 
kernel/hrtimer.c patch | diff1 | diff2 | blob | history
kernel/time/tick-internal.h patch | diff1 | diff2 | blob | history

diff --cc kernel/hrtimer.c
Simple merge
diff --cc kernel/time/tick-internal.h
Simple merge