diff options
| author | Ingo Molnar <[email protected]> | 2012-07-18 09:24:41 +0000 |
|---|---|---|
| committer | Ingo Molnar <[email protected]> | 2012-07-18 09:25:55 +0000 |
| commit | eec19d1a0d04c80e66eef634f7b8f460f2ca5643 (patch) | |
| tree | e68f24938d458fc776b76dc6037f9a2d03f09403 /fs/jbd2/commit.c | |
| parent | time: Rework timekeeping functions to take timekeeper ptr as argument (diff) | |
| parent | Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net (diff) | |
| download | kernel-eec19d1a0d04c80e66eef634f7b8f460f2ca5643.tar.gz kernel-eec19d1a0d04c80e66eef634f7b8f460f2ca5643.zip | |
Merge branch 'linus' into timers/core
Resolve semantic conflict in kernel/time/timekeeping.c.
Signed-off-by: Ingo Molnar <[email protected]>
Diffstat (limited to 'fs/jbd2/commit.c')
0 files changed, 0 insertions, 0 deletions