From: Ingo Molnar <mingo@elte.hu> Date: Thu, 4 Mar 2010 10:45:25 +0000 (+0100) Subject: Merge branches 'core/futexes' and 'core/iommu' into core/urgent X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=0e064caf6402d1d67db4233d26beec88ca212919;p=GitHub%2FLineageOS%2FG12%2Fandroid_kernel_amlogic_linux-4.9.git Merge branches 'core/futexes' and 'core/iommu' into core/urgent Merge reason: Switch from topical split to the stabilization track Signed-off-by: Ingo Molnar <mingo@elte.hu> --- 0e064caf6402d1d67db4233d26beec88ca212919