Merge branch 'at91-fixes' of git://github.com/at91linux/linux-at91 into fixes
authorArnd Bergmann <arnd@arndb.de>
Mon, 13 Feb 2012 23:25:44 +0000 (23:25 +0000)
committerArnd Bergmann <arnd@arndb.de>
Mon, 13 Feb 2012 23:25:44 +0000 (23:25 +0000)
* 'at91-fixes' of git://github.com/at91linux/linux-at91:
  ARM: at91: drop ide driver in favor of the pata one
  pata/at91: use newly introduced SMC accessors
  ARM: at91: add accessor to manage SMC
  ARM: at91:rtc/rtc-at91sam9: ioremap register bank
  ARM: at91: USB AT91 gadget registration for module


Trivial merge