From: Ingo Molnar <mingo@kernel.org>
Date: Sun, 2 Feb 2014 08:45:39 +0000 (+0100)
Subject: Merge branch 'linus' into sched/core, to resolve conflicts
X-Git-Tag: v3.15-rc1~116^2~56
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=eaa4e4fcf1b5c60e656d93242f7fe422173f25b2;p=pandora-kernel.git

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

Conflicts:
	kernel/sysctl.c

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

eaa4e4fcf1b5c60e656d93242f7fe422173f25b2
Reading git-diff-tree failed