| commit | eec19d1a0d04c80e66eef634f7b8f460f2ca5643 | [log] [tgz] |
|---|---|---|
| author | Ingo Molnar <mingo@kernel.org> | Wed Jul 18 11:24:41 2012 +0200 |
| committer | Ingo Molnar <mingo@kernel.org> | Wed Jul 18 11:25:55 2012 +0200 |
| tree | e68f24938d458fc776b76dc6037f9a2d03f09403 | |
| parent | f726a697d06102e7a1fc0a87308cb30a84580205 [diff] | |
| parent | a018540141a931f5299a866907b27886916b4374 [diff] |
Merge branch 'linus' into timers/core Resolve semantic conflict in kernel/time/timekeeping.c. Signed-off-by: Ingo Molnar <mingo@kernel.org>