Merge remote-tracking branch 'lsk/v3.10/topic/hrtimer' into linux-linaro-lsk
authorMark Brown <broonie@kernel.org>
Wed, 21 Jan 2015 22:27:49 +0000 (22:27 +0000)
committerMark Brown <broonie@kernel.org>
Wed, 21 Jan 2015 22:27:49 +0000 (22:27 +0000)
commit709d22822886bfb105a1c498c14ab6647d0f1284
tree44446c08c5d8fd6de51b997c492ad8eba39349e8
parent2eb736d6b425cb932b038fd555243b9b0e59c036
parenteab6f41c54bbdfb82ba46f3ee047bfe5dbd74e6b
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
include/linux/clockchips.h
kernel/time/clockevents.c
kernel/time/tick-broadcast.c
kernel/time/tick-common.c