From: Ingo Molnar Date: Mon, 26 Mar 2012 15:18:44 +0000 (+0200) Subject: Merge branch 'linus' into perf/urgent X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=7fd52392c56361a40f0c630a82b36b95ca31eac6;p=GitHub%2Fexynos8895%2Fandroid_kernel_samsung_universal8895.git Merge branch 'linus' into perf/urgent Merge reason: we need to fix a non-trivial merge conflict. Signed-off-by: Ingo Molnar --- 7fd52392c56361a40f0c630a82b36b95ca31eac6