]> git.baikalelectronics.ru Git - kernel.git/commit
Merge branch 'linus' into timers/core
authorIngo Molnar <mingo@kernel.org>
Wed, 18 Jul 2012 09:24:41 +0000 (11:24 +0200)
committerIngo Molnar <mingo@kernel.org>
Wed, 18 Jul 2012 09:25:55 +0000 (11:25 +0200)
commit031228a8c83799ef662a1963be581560601ad837
treee68f24938d458fc776b76dc6037f9a2d03f09403
parent3fcccaccf5a8ec11606b225264fc55be24f18308
parent2007ebf362fd7bd116ccfde58f62146f7b73f1e1
Merge branch 'linus' into timers/core

Resolve semantic conflict in kernel/time/timekeeping.c.

Signed-off-by: Ingo Molnar <mingo@kernel.org>
kernel/time/timekeeping.c