]> git.openfabrics.org - ~shefty/rdma-dev.git/commit
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)
commit25e4b485fb8eeda8aa7a2e1e45fbb31538565117
tree12d57a8403b3dc7aca72a13896c3e73aca98a4a9
parentabbb0db2bd9d0bbfad3219604045168c50180539
parent878040ef831a12855af26a42cc25c817f4fb3f2d
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 <arnd@arndb.de>
drivers/mtd/nand/bcm_umi_nand.c