From: Ingo Molnar <mingo@kernel.org>
Date: Sat, 13 Feb 2016 07:30:07 +0000 (+0100)
Subject: Merge branch 'linus' into locking/core, to resolve conflicts
X-Git-Tag: v4.6-rc1~168^2~19
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e2d6f8a5f596b1f09839990b11a3c2e0c9f0dbc2;p=thirdparty%2Flinux.git

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

Conflicts:
	kernel/locking/lockdep.c

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

e2d6f8a5f596b1f09839990b11a3c2e0c9f0dbc2