git.openpandora.org
/
pandora-kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
f4e6e1e
389e067
)
Merge remote-tracking branch 'tip/timers/core' into fordlezcano/3.13/sched-clock64...
author
John Stultz
<john.stultz@linaro.org>
Thu, 26 Sep 2013 19:05:54 +0000
(12:05 -0700)
committer
John Stultz
<john.stultz@linaro.org>
Thu, 26 Sep 2013 19:05:54 +0000
(12:05 -0700)
Update to tip/timers/core and resolve minor conflict.
Conflicts:
drivers/clocksource/samsung_pwm_timer.c
Signed-off-by: John Stultz <john.stultz@linaro.org>
Trivial merge
git.openpandora.org / pandora-kernel.git / commitdiff