From: Ingo Molnar Date: Sat, 13 Feb 2016 07:30:07 +0000 (+0100) Subject: Merge branch 'linus' into locking/core, to resolve conflicts X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=e2d6f8a5f596b1f09839990b11a3c2e0c9f0dbc2;p=GitHub%2Fmoto-9609%2Fandroid_kernel_motorola_exynos9610.git Merge branch 'linus' into locking/core, to resolve conflicts Conflicts: kernel/locking/lockdep.c Signed-off-by: Ingo Molnar --- e2d6f8a5f596b1f09839990b11a3c2e0c9f0dbc2