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 <[email protected]>

diff --cc drivers/mtd/nand/bcm_umi_nand.c
Simple merge