From: Ingo Molnar Date: Wed, 30 May 2012 08:59:04 +0000 (+0200) Subject: Merge branch 'linus' into perf/urgent X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=063e04776172f93b16a5eefd5661a340c1126513;p=GitHub%2FLineageOS%2FG12%2Fandroid_kernel_amlogic_linux-4.9.git Merge branch 'linus' into perf/urgent Merge back Linus's latest branch so that we pick up the uprobes changes. ( I tested this branch locally and while it's one from the middle of the merge window it's a good one to base further work off. ) Signed-off-by: Ingo Molnar --- 063e04776172f93b16a5eefd5661a340c1126513