]> asedeno.scripts.mit.edu Git - linux.git/commitdiff
projects / linux.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: fed0764 0cbb0b9)
Merge branch 'linus' into locking/core, to resolve conflicts
authorIngo Molnar <mingo@kernel.org>
Sat, 13 Feb 2016 07:30:07 +0000 (08:30 +0100)
committerIngo Molnar <mingo@kernel.org>
Sat, 13 Feb 2016 07:30:07 +0000 (08:30 +0100)
Conflicts:
kernel/locking/lockdep.c

Signed-off-by: Ingo Molnar <mingo@kernel.org>

Trivial merge
local clone of linux.git