tree 8e8fd8ce48892e667092aea6532548a4f79f9c25
parent f8abea8f8c24ecdad6d6861bffb912f23f2741cd
parent 41d8ca452f523b9245704c7dd8ef290fa7b78e6b
author Linus Torvalds <torvalds@woody.linux-foundation.org> 1171642784 -0800
committer Linus Torvalds <torvalds@woody.linux-foundation.org> 1171642784 -0800

Merge branch 'for-linus' of git://www.atmel.no/~hskinnemoen/linux/kernel/avr32

* 'for-linus' of git://www.atmel.no/~hskinnemoen/linux/kernel/avr32:
  [AVR32] Use per-controller spi_board_info structures
  [AVR32] Warn, don't BUG if clk_disable is called too many times
  [AVR32] Make sure all genclocks have a parent
  [AVR32] Remove unnecessary sys_nfsservctl conditional
  [AVR32] Wire up the SysV IPC calls properly
  [AVR32] Define ioremap_nocache, ioport_map and ioport_unmap
  [AVR32] Fix prototypes for __raw_writesb and friends