Merge remote-tracking branch 'lsk/v3.10/topic/mm-timer' into linux-linaro-lsk
authorMark Brown <broonie@linaro.org>
Fri, 13 Jun 2014 19:59:53 +0000 (20:59 +0100)
committerMark Brown <broonie@linaro.org>
Fri, 13 Jun 2014 19:59:53 +0000 (20:59 +0100)
commitfa111b17925054b963e813f944de8cd96248febc
treec81503e952067e7efc24d71dfb6f20f4b2e752e7
parentdc689ae270067b59c4d281e3132eb26d78a78026
parentca3a638daef5b2b489bd105f3d95e7faf077cea3
Merge remote-tracking branch 'lsk/v3.10/topic/mm-timer' into linux-linaro-lsk

Conflicts:
drivers/clocksource/arm_arch_timer.c
arch/arm/include/asm/arch_timer.h
arch/arm64/include/asm/arch_timer.h
drivers/clocksource/arm_arch_timer.c
include/clocksource/arm_arch_timer.h