]> git.baikalelectronics.ru Git - kernel.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)
commitad2e22230812fafd694f28c320871882a5d465d9
tree12d57a8403b3dc7aca72a13896c3e73aca98a4a9
parenteb0a37b44d12a93b4aa645b9fce147e89c5a6168
parent9dca54c7475b62206da4bfe75dd3bb0971938aaf
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