Commits
Merge branch 'formingo/3.2/tip/timers/core' of git://git.linaro.org/people/jstultz/linux into timers/core Conflicts: kernel/time/timekeeping.c
Merge branch 'formingo/3.2/tip/timers/core' of git://git.linaro.org/people/jstultz/linux into timers/core Conflicts: kernel/time/timekeeping.c