diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-06-30 10:44:13 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-06-30 10:44:13 -0700 |
| commit | 5fc3054d76a05633ae7341163b8c22a51e63483e (patch) | |
| tree | fa8bbe4c3bbf1cd10f8ec249d9cb6b50c31b8404 /MAINTAINERS | |
| parent | 3b775e2246ae861daec276d3229a7de2af69b7db (diff) | |
| parent | e336f61fe238ade68eca7850d64fd6c194bdc998 (diff) | |
| download | lwn-5fc3054d76a05633ae7341163b8c22a51e63483e.tar.gz lwn-5fc3054d76a05633ae7341163b8c22a51e63483e.zip | |
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
Diffstat (limited to 'MAINTAINERS')
| -rw-r--r-- | MAINTAINERS | 10 |
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> -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 |