]> git.openfabrics.org - ~shefty/rdma-dev.git/commitdiff
Merge branch 'bcmring/cleanup' into bcmring/removal
authorArnd Bergmann <arnd@arndb.de>
Fri, 28 Sep 2012 19:41:56 +0000 (21:41 +0200)
committerArnd Bergmann <arnd@arndb.de>
Fri, 28 Sep 2012 19:41:56 +0000 (21:41 +0200)
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 <arnd@arndb.de>
1  2 
drivers/mtd/nand/bcm_umi_nand.c

Simple merge