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

Conflicts:
	kernel/locking/lockdep.c

Signed-off-by: Ingo Molnar <mingo@kernel.org>
This commit is contained in:
Ingo Molnar 2016-02-13 08:30:07 +01:00
commit e2d6f8a5f5
189 changed files with 1678 additions and 971 deletions