]> git.baikalelectronics.ru Git - kernel.git/commit
projects / kernel.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: f24c612 1015674)
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)
commit3c2f25291064308d9b4e2bcbb91cd421a75051ed
tree12d57a8403b3dc7aca72a13896c3e73aca98a4a9tree | snapshot
parentf24c612c6b8f59d1c3aaa37250c6d75aa12ed63fcommit | diff
parent101567434cba77b61443646956f33055d1ac43efcommit | diff
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 diff1 | diff2 | blob | history
Linux Kernel Source Tree.