Merge tag 'at91-fixes-non-critical' of git://github.com/at91linux/linux-at91 into...
authorArnd Bergmann <arnd@arndb.de>
Thu, 25 Sep 2014 23:49:21 +0000 (01:49 +0200)
committerArnd Bergmann <arnd@arndb.de>
Thu, 25 Sep 2014 23:49:21 +0000 (01:49 +0200)
Pull "Fixes non critical for AT91" from Nicolas Ferre:

- mmc pinmux for at91sam9263 was missing
- little fix of the old clock implementation

Signed-off-by: Arnd Bergmann <arnd@arndb.de>
* tag 'at91-fixes-non-critical' of git://github.com/at91linux/linux-at91:
  ARM: at91/PMC: don't forget to write PMC_PCDR register to disable clocks
  ARM: at91: fix at91sam9263ek DT mmc pinmuxing settings


Trivial merge