Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/egtvedt...
authorLinus Torvalds <torvalds@linux-foundation.org>
Thu, 8 Aug 2013 20:11:53 +0000 (13:11 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Thu, 8 Aug 2013 20:11:53 +0000 (13:11 -0700)
commit6c2580c501c660fdfb506061e016d84570fceba1
treec194f82f1327e5453a7fcd702eb9c33a997ca6a5
parent8742f229b635bf1c1c84a3dfe5e47c814c20b5c8
parentc4afd7b95fff2f4964e630d0de90e8bc94ae37f1
Merge branch 'for-linus' of git://git./linux/kernel/git/egtvedt/linux-avr32

Pull AVR32 build fix from Hans-Christian Egtvedt.

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/egtvedt/linux-avr32:
  avr32: boards/atngw100/mrmt.c: fix building error