Skip to content

Commit

Permalink
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel…
Browse files Browse the repository at this point in the history
…/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
  • Loading branch information
torvalds committed Jun 30, 2011
2 parents 3b775e2 + e336f61 commit 5fc3054
Showing 1 changed file with 6 additions and 4 deletions.
10 changes: 6 additions & 4 deletions MAINTAINERS
Original file line number Diff line number Diff line change
Expand Up @@ -1345,16 +1345,18 @@ F: drivers/auxdisplay/
F: include/linux/cfag12864b.h

AVR32 ARCHITECTURE
M: Hans-Christian Egtvedt <[email protected]>
M: Haavard Skinnemoen <[email protected]>
M: Hans-Christian Egtvedt <[email protected]>
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 <[email protected]>
S: Supported
M: Haavard Skinnemoen <[email protected]>
M: Hans-Christian Egtvedt <[email protected]>
S: Maintained
F: arch/avr32/mach-at32ap/

AX.25 NETWORK LAYER
Expand Down

0 comments on commit 5fc3054

Please sign in to comment.