From: Thomas Gleixner Date: Fri, 21 Feb 2014 20:36:40 +0000 (+0100) Subject: Merge branch 'linus' into sched/core X-Git-Tag: v3.15-rc1~116^2~32 X-Git-Url: https://git.kernel.dk/?a=commitdiff_plain;h=d97a860c4f3de98ba5040a22f305b7159fe17cff;p=linux-2.6-block.git Merge branch 'linus' into sched/core Reason: Bring bakc upstream modification to resolve conflicts Signed-off-by: Thomas Gleixner --- d97a860c4f3de98ba5040a22f305b7159fe17cff