diff options
| author | Ingo Molnar <mingo@elte.hu> | 2011-11-11 08:10:42 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2011-11-11 08:10:42 +0100 |
| commit | 367177e50189ab0a983b52f3d3f7eb2a1927db71 (patch) | |
| tree | fed5e93eb35d002e21cb3c2fafbfe38062aaa266 /kernel/timer.c | |
| parent | c2bc11113c50449f23c40b724fe410fc2380a8e9 (diff) | |
| parent | d65670a78cdbfae94f20a9e05ec705871d7cdf2b (diff) | |
Merge branch 'formingo/3.2/tip/timers/core' of git://git.linaro.org/people/jstultz/linux into timers/core
Conflicts:
kernel/time/timekeeping.c
Diffstat (limited to 'kernel/timer.c')
0 files changed, 0 insertions, 0 deletions