tree 89cbe4ac48e8e8f80ff5849e2cc33f045f5ccd52
parent 17c330f98383629cfd359ee62b3adde1d2a3ff7c
parent 0386f9e68fc92a3650088b86d908b07de4fb1744
author Linus Torvalds <torvalds@linux-foundation.org> 1260896460 -0800
committer Linus Torvalds <torvalds@linux-foundation.org> 1260896460 -0800

Merge git://git.kernel.org/pub/scm/linux/kernel/git/hskinnemoen/avr32-2.6

* git://git.kernel.org/pub/scm/linux/kernel/git/hskinnemoen/avr32-2.6:
  avr32: update default configurations for ATNGW100, ATSTK1002 and ATSTK1006
  avr32: add default configurations for ATNGW100 mkII and EVKLCD10X
  avr32: add support for ATNGW100 mkII board
  avr32: convert to asm-generic/hardirq.h
  avr32: add two new at91 to cpu.h definition
  avr32: clean up linker script using standard macros.
  avr32: MRMT: correct setup of SPI slaves
  avr32: function for independently setting up SPI slaves
  avr32: re-instate MCI WP/CD pin assignments for ATNGW100