From: Arnd Bergmann Date: Fri, 28 Sep 2012 19:41:56 +0000 (+0200) Subject: Merge branch 'bcmring/cleanup' into bcmring/removal X-Git-Tag: firefly_0821_release~3680^2~1956^2~1^2 X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=25e4b485fb8eeda8aa7a2e1e45fbb31538565117;p=firefly-linux-kernel-4.4.55.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