From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sat, 13 Jun 2009 20:18:32 +0000 (-0700)
Subject: Merge git://git.kernel.org/pub/scm/linux/kernel/git/hskinnemoen/avr32-2.6
X-Git-Tag: v2.6.31-rc1~346
X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=84c48e6f43ae1771fc67fd8fcd777ff4b3b4465b;p=~emulex%2Finfiniband.git

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: Fix oops on unaligned user access
  avr32: Add support for Mediama RMTx add-on board for ATNGW100
  avr32: Change Atmel ATNGW100 config to add choice of add-on board
  Fix MIMC200 board LCD init
  avr32: Fix clash in ATMEL_USART_ flags
  avr32: remove obsolete hw_interrupt_type
  avr32: Solves problem with inverted MCI detect pin on Merisc board
  atmel-mci: Add support for inverted detect pin
---

84c48e6f43ae1771fc67fd8fcd777ff4b3b4465b