Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/egtvedt/avr32-2.6

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/egtvedt/avr32-2.6: MAINTAINERS: update AVR32 and AT32AP maintainers
author: Linus Torvalds <torvalds@linux-foundation.org> 2011-06-30 13:44:13 -0400
committer: Linus Torvalds <torvalds@linux-foundation.org> 2011-06-30 13:44:13 -0400
commit: 5fc3054d76a05633ae7341163b8c22a51e63483e (patch)
tree: fa8bbe4c3bbf1cd10f8ec249d9cb6b50c31b8404 /MAINTAINERS
parent: 3b775e2246ae861daec276d3229a7de2af69b7db (diff)
parent: e336f61fe238ade68eca7850d64fd6c194bdc998 (diff)
1 files changed, 6 insertions, 4 deletions
diff --git a/MAINTAINERS b/MAINTAINERS
index d2dcef7cd9b2..1b9bcdaef6ff 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -1345,16 +1345,18 @@ F:	drivers/auxdisplay/
 F:      include/linux/cfag12864b.h
 AVR32 ARCHITECTURE
-M:      Hans-Christian Egtvedt <hans-christian.egtvedt@atmel.com>
+M:      Haavard Skinnemoen <hskinnemoen@gmail.com>
+M:      Hans-Christian Egtvedt <egtvedt@samfundet.no>
 W:      http://www.atmel.com/products/AVR32/
 W:      http://avr32linux.org/
 W:      http://avrfreaks.net/
-S:      Supported
+S:      Maintained
 F:      arch/avr32/
 AVR32/AT32AP MACHINE SUPPORT
-M:      Hans-Christian Egtvedt <hans-christian.egtvedt@atmel.com>
+M:      Haavard Skinnemoen <hskinnemoen@gmail.com>
-S:      Supported
+M:      Hans-Christian Egtvedt <egtvedt@samfundet.no>
+S:      Maintained
 F:      arch/avr32/mach-at32ap/
 AX.25 NETWORK LAYER
author	Linus Torvalds <torvalds@linux-foundation.org>	2011-06-30 13:44:13 -0400
committer	Linus Torvalds <torvalds@linux-foundation.org>	2011-06-30 13:44:13 -0400
commit	5fc3054d76a05633ae7341163b8c22a51e63483e (patch)
tree	fa8bbe4c3bbf1cd10f8ec249d9cb6b50c31b8404 /MAINTAINERS
parent	3b775e2246ae861daec276d3229a7de2af69b7db (diff)
parent	e336f61fe238ade68eca7850d64fd6c194bdc998 (diff)

diff --git a/MAINTAINERS b/MAINTAINERS index d2dcef7cd9b2..1b9bcdaef6ff 100644 --- a/MAINTAINERS +++ b/MAINTAINERS
@@ -1345,16 +1345,18 @@ F: drivers/auxdisplay/
1345	F: include/linux/cfag12864b.h	1345	F: include/linux/cfag12864b.h
1346		1346
1347	AVR32 ARCHITECTURE	1347	AVR32 ARCHITECTURE
1348	M: Hans-Christian Egtvedt <hans-christian.egtvedt@atmel.com>	1348	M: Haavard Skinnemoen <hskinnemoen@gmail.com>
		1349	M: Hans-Christian Egtvedt <egtvedt@samfundet.no>
1349	W: http://www.atmel.com/products/AVR32/	1350	W: http://www.atmel.com/products/AVR32/
1350	W: http://avr32linux.org/	1351	W: http://avr32linux.org/
1351	W: http://avrfreaks.net/	1352	W: http://avrfreaks.net/
1352	S: Supported	1353	S: Maintained
1353	F: arch/avr32/	1354	F: arch/avr32/
1354		1355
1355	AVR32/AT32AP MACHINE SUPPORT	1356	AVR32/AT32AP MACHINE SUPPORT
1356	M: Hans-Christian Egtvedt <hans-christian.egtvedt@atmel.com>	1357	M: Haavard Skinnemoen <hskinnemoen@gmail.com>
1357	S: Supported	1358	M: Hans-Christian Egtvedt <egtvedt@samfundet.no>
		1359	S: Maintained
1358	F: arch/avr32/mach-at32ap/	1360	F: arch/avr32/mach-at32ap/
1359		1361
1360	AX.25 NETWORK LAYER	1362	AX.25 NETWORK LAYER