projects
/
platform
/
kernel
/
linux-rpi.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
abbb0db
878040e
)
Merge branch 'bcmring/cleanup' into bcmring/removal
author
Arnd Bergmann
<arnd@arndb.de>
Fri, 28 Sep 2012 19:41:56 +0000
(21:41 +0200)
committer
Arnd 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
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
drivers/mtd/nand/bcm_umi_nand.c
Simple merge