projects
/
linux-2.6-block.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge tag 'v4.4-rc2' into fixes
[linux-2.6-block.git]
/
MAINTAINERS
diff --git
a/MAINTAINERS
b/MAINTAINERS
index 050d0e77a2cf00f7d6a33e6d11bccf88c22ad761..7c0e48c1196caea7f8f8781d26efeaca2643263e 100644
(file)
--- a/
MAINTAINERS
+++ b/
MAINTAINERS
@@
-1931,7
+1931,7
@@
S: Supported
F: drivers/i2c/busses/i2c-at91.c
ATMEL ISI DRIVER
F: drivers/i2c/busses/i2c-at91.c
ATMEL ISI DRIVER
-M:
Josh Wu <josh.wu
@atmel.com>
+M:
Ludovic Desroches <ludovic.desroches
@atmel.com>
L: linux-media@vger.kernel.org
S: Supported
F: drivers/media/platform/soc_camera/atmel-isi.c
L: linux-media@vger.kernel.org
S: Supported
F: drivers/media/platform/soc_camera/atmel-isi.c
@@
-1950,7
+1950,8
@@
S: Supported
F: drivers/net/ethernet/cadence/
ATMEL NAND DRIVER
F: drivers/net/ethernet/cadence/
ATMEL NAND DRIVER
-M: Josh Wu <josh.wu@atmel.com>
+M: Wenyou Yang <wenyou.yang@atmel.com>
+M: Josh Wu <rainyfeeling@outlook.com>
L: linux-mtd@lists.infradead.org
S: Supported
F: drivers/mtd/nand/atmel_nand*
L: linux-mtd@lists.infradead.org
S: Supported
F: drivers/mtd/nand/atmel_nand*