Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5fc3054d authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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
parents 3b775e22 e336f61f

MAINTAINERS

+6 −4
Original line number Diff line number Diff line
@@ -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>

S:	Supported

M:	Haavard Skinnemoen <hskinnemoen@gmail.com>

M:	Hans-Christian Egtvedt <egtvedt@samfundet.no>

S:	Maintained

F:	arch/avr32/mach-at32ap/



AX.25 NETWORK LAYER