]> git.baikalelectronics.ru Git - kernel.git/commit
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)
commit5c92cac351ade1fdcb568e2a3f60e0b96f9cef20
treefed5e93eb35d002e21cb3c2fafbfe38062aaa266
parent70edd1ef3277b079466853b0c39c2fbccd0282f8
parent8438fc53f9af21f720cee07c02713c56762e1b38
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