Merge branch 'local_timers-for-arm-soc' of git://git.kernel.org/pub/scm/linux/kernel...