From 00c47fba71018c2e5139e2192fe9c4c137ee8fa3 Mon Sep 17 00:00:00 2001 From: Nicolas Ferre Date: Mon, 14 Jan 2008 00:55:13 -0800 Subject: [PATCH] --- yaml --- r: 75446 b: refs/heads/master c: 8f4c79ce79d1552014af3c115d03e13092443905 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/MAINTAINERS | 8 +++++++- trunk/drivers/video/atmel_lcdfb.c | 2 +- 3 files changed, 9 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 2b88f1eb80d3..4da687fa27c3 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 2490c681ea3d7f5ac3fb876f14567bf1a9e0aa87 +refs/heads/master: 8f4c79ce79d1552014af3c115d03e13092443905 diff --git a/trunk/MAINTAINERS b/trunk/MAINTAINERS index 92aa0a7e58ea..2340cfb1e25d 100644 --- a/trunk/MAINTAINERS +++ b/trunk/MAINTAINERS @@ -665,12 +665,18 @@ S: Maintained ATMEL AT91 MCI DRIVER P: Nicolas Ferre -M: nicolas.ferre@rfo.atmel.com +M: nicolas.ferre@atmel.com L: linux-arm-kernel@lists.arm.linux.org.uk (subscribers-only) W: http://www.atmel.com/products/AT91/ W: http://www.at91.com/ S: Maintained +ATMEL LCDFB DRIVER +P: Nicolas Ferre +M: nicolas.ferre@atmel.com +L: linux-fbdev-devel@lists.sourceforge.net (subscribers-only) +S: Maintained + ATMEL MACB ETHERNET DRIVER P: Haavard Skinnemoen M: hskinnemoen@atmel.com diff --git a/trunk/drivers/video/atmel_lcdfb.c b/trunk/drivers/video/atmel_lcdfb.c index 11a3a222dfc3..7c30cc8df71e 100644 --- a/trunk/drivers/video/atmel_lcdfb.c +++ b/trunk/drivers/video/atmel_lcdfb.c @@ -801,5 +801,5 @@ module_init(atmel_lcdfb_init); module_exit(atmel_lcdfb_exit); MODULE_DESCRIPTION("AT91/AT32 LCD Controller framebuffer driver"); -MODULE_AUTHOR("Nicolas Ferre "); +MODULE_AUTHOR("Nicolas Ferre "); MODULE_LICENSE("GPL");