diff options
| author | Mark Brown <broonie@kernel.org> | 2015-01-21 22:27:49 +0000 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2015-01-21 22:27:49 +0000 |
| commit | 709d22822886bfb105a1c498c14ab6647d0f1284 (patch) | |
| tree | 44446c08c5d8fd6de51b997c492ad8eba39349e8 /kernel/cpu.c | |
| parent | 2eb736d6b425cb932b038fd555243b9b0e59c036 (diff) | |
| parent | eab6f41c54bbdfb82ba46f3ee047bfe5dbd74e6b (diff) | |
Merge remote-tracking branch 'lsk/v3.10/topic/hrtimer' into linux-linaro-lsk
Conflicts:
kernel/time/clockevents.c
kernel/time/tick-broadcast.c
kernel/time/tick-common.c
kernel/time/tick-internal.h
Diffstat (limited to 'kernel/cpu.c')
0 files changed, 0 insertions, 0 deletions