commit 4068b00e9d0542653b26c04dcf05ab0c80bbbbb2
author Linus Torvalds <torvalds@linux-foundation.org> Tue Jun 14 11:25:56 2011 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> Tue Jun 14 11:25:56 2011 -0700
tree 200e21afc8155b2043c1e9f63b8825c2f5e9cede
parent f39e8409955fad210a9a7169cc53c4c18daaef3a
parent ff71db2f0784cfff38fa7b55908867a24ccc3216

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/egtvedt/avr32-2.6

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/egtvedt/avr32-2.6:
  avr32, exec: remove redundant set_fs(USER_DS)
  avr32: make intc_resume() return void to conform to syscore_ops
  avr32: add some more at91 to cpu.h definition
  avr32: set CONFIG_CC_OPTIMIZE_FOR_SIZE=y for all defconfigs
  avr32/at32ap: fix mapping of platform device id for USART
  avr32: fix use of non-existing portnr variable in at32_map_usart()