asedeno.scripts.mit.edu Git - linux.git/commit

]> asedeno.scripts.mit.edu Git - linux.git/commit

projects / linux.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: fed0764 0cbb0b9)

author	Ingo Molnar <mingo@kernel.org>
	Sat, 13 Feb 2016 07:30:07 +0000 (08:30 +0100)
committer	Ingo Molnar <mingo@kernel.org>
	Sat, 13 Feb 2016 07:30:07 +0000 (08:30 +0100)
commit	e2d6f8a5f596b1f09839990b11a3c2e0c9f0dbc2
tree	7ccf35788cbb9def996204399f079366da251361	tree \| snapshot
parent	fed0764fafd8e2e629a033c0f7df4106b0dcb7f0	commit \| diff
parent	0cbb0b92689a1c4e0ac55f6188be563a813ac808	commit \| diff

Merge branch 'linus' into locking/core, to resolve conflicts

Conflicts:
kernel/locking/lockdep.c

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

local clone of linux.git