lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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

Browse Source 
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/egtvedt/avr32-2.6:
  MAINTAINERS: update AVR32 and AT32AP maintainers
This commit is contained in:
Linus Torvalds
2011-06-30 10:44:13 -07:00
parent 3b775e2246 e336f61fe2
commit 5fc3054d76
1 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
MAINTAINERS
View File

@@ -1345,16 +1345,18 @@ F: drivers/auxdisplay/
F: include/linux/cfag12864b.h F: include/linux/cfag12864b.h
AVR32 ARCHITECTURE 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://www.atmel.com/products/AVR32/
W: http://avr32linux.org/ W: http://avr32linux.org/
W: http://avrfreaks.net/ W: http://avrfreaks.net/
S: Supported S: Maintained
F: arch/avr32/ F: arch/avr32/
AVR32/AT32AP MACHINE SUPPORT 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/ F: arch/avr32/mach-at32ap/
AX.25 NETWORK LAYER AX.25 NETWORK LAYER