From: Linus Torvalds <torvalds@woody.linux-foundation.org>
Date: Fri, 16 Feb 2007 16:19:44 +0000 (-0800)
Subject: Merge branch 'for-linus' of git://www.atmel.no/~hskinnemoen/linux/kernel/avr32
X-Git-Tag: v2.6.21-rc1~93
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=8a03d9a498eaf02c8a118752050a5154852c13bf;p=linux-2.6-omap-h63xx.git

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
---

8a03d9a498eaf02c8a118752050a5154852c13bf