Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/egtvedt...
authorLinus Torvalds <torvalds@linux-foundation.org>
Thu, 30 Jun 2011 17:44:13 +0000 (10:44 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Thu, 30 Jun 2011 17:44:13 +0000 (10:44 -0700)
commit5fc3054d76a05633ae7341163b8c22a51e63483e
treefa8bbe4c3bbf1cd10f8ec249d9cb6b50c31b8404
parent3b775e2246ae861daec276d3229a7de2af69b7db
parente336f61fe238ade68eca7850d64fd6c194bdc998
Merge branch 'for-linus' of git://git./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
MAINTAINERS