| commit | eec19d1a0d04c80e66eef634f7b8f460f2ca5643 | |
| author | Ingo Molnar <mingo@kernel.org> | |
| Wed, 18 Jul 2012 09:24:41 +0000 (18 11:24 +0200) | ||
| committer | Ingo Molnar <mingo@kernel.org> | |
| Wed, 18 Jul 2012 09:25:55 +0000 (18 11:25 +0200) | ||
| tree | e68f24938d458fc776b76dc6037f9a2d03f09403 | treesnapshot (tar.gz zip) |
| parent | f726a697d06102e7a1fc0a87308cb30a84580205 | commitdiff |
| parent | a018540141a931f5299a866907b27886916b4374 | commitdiff |
Merge branch 'linus' into timers/core
Resolve semantic conflict in kernel/time/timekeeping.c.
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Resolve semantic conflict in kernel/time/timekeeping.c.
Signed-off-by: Ingo Molnar <mingo@kernel.org>
| kernel/time/timekeeping.c | diff1 | diff2 | blobhistory |