Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/egtvedt...
Linus Torvalds [Thu, 30 Jun 2011 17:44:13 +0000 (10:44 -0700)]
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/egtvedt/avr32-2.6:
  MAINTAINERS: update AVR32 and AT32AP maintainers

1  2 
MAINTAINERS

diff --cc MAINTAINERS
Simple merge