Merge branch 'formingo/3.2/tip/timers/core' of git://git.linaro.org/people/jstultz...
authorIngo Molnar <mingo@elte.hu>
Fri, 11 Nov 2011 07:10:42 +0000 (08:10 +0100)
committerIngo Molnar <mingo@elte.hu>
Fri, 11 Nov 2011 07:10:42 +0000 (08:10 +0100)
commit367177e50189ab0a983b52f3d3f7eb2a1927db71
treefed5e93eb35d002e21cb3c2fafbfe38062aaa266
parentc2bc11113c50449f23c40b724fe410fc2380a8e9
parentd65670a78cdbfae94f20a9e05ec705871d7cdf2b
Merge branch 'formingo/3.2/tip/timers/core' of git://git.linaro.org/people/jstultz/linux into timers/core

Conflicts:
kernel/time/timekeeping.c
kernel/time/timekeeping.c