tree 2dc0953afd7f54f3269486fc0edbb41cd9cf804e
parent 88fa269bedc3ae0f67426ea7fe9d306103b7fb1c
parent cf844751fb25e095d8fa30332cb173a73e5a736c
author Arnd Bergmann <arnd@arndb.de> 1329175544 +0000
committer Arnd Bergmann <arnd@arndb.de> 1329175544 +0000

Merge branch 'at91-fixes' of git://github.com/at91linux/linux-at91 into fixes

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