From: Arnd Bergmann Date: Fri, 28 Sep 2012 19:41:56 +0000 (+0200) Subject: Merge branch 'bcmring/cleanup' into bcmring/removal X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=25e4b485fb8eeda8aa7a2e1e45fbb31538565117;p=GitHub%2FLineageOS%2FG12%2Fandroid_kernel_amlogic_linux-4.9.git Merge branch 'bcmring/cleanup' into bcmring/removal Doing a large-scale cleaning and removing the platform in another branch don't mix well, so do the trivial merge here. Signed-off-by: Arnd Bergmann --- 25e4b485fb8eeda8aa7a2e1e45fbb31538565117