Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/hskinnemoen...
authorLinus Torvalds <torvalds@linux-foundation.org>
Thu, 18 Dec 2008 20:01:02 +0000 (12:01 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Thu, 18 Dec 2008 20:01:02 +0000 (12:01 -0800)
* 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/hskinnemoen/avr32-2.6:
  avr32: favr-32 build fix
  ATSTK1006: Fix boot from NAND flash
  avr32: remove .note.gnu.build-id section when making vmlinux.bin
  avr32: Enable pullup on USART TX lines


Trivial merge