From: Olof Johansson <olof@lixom.net>
Date: Fri, 18 Jul 2014 21:39:18 +0000 (-0700)
Subject: Merge tag 'at91-fixes' of git://github.com/at91linux/linux-at91 into fixes
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=054388947ca926260248774819858ee2dbbc735d;p=linux.git

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

Merge "at91: fixes for 3.16 #2" from Nicolas Ferre:

Second AT91 fixes series for 3.16
- fix clock definitions after the move to CCF for:
  * at91sam9n12 (ohci)
  * at91sam9x5 (ohci, pwm)

* tag 'at91-fixes' of git://github.com/at91linux/linux-at91:
  ARM: at91/dt: add missing clocks property to pwm node in sam9x5.dtsi
  ARM: at91/dt: fix usb0 clocks definition in sam9n12 dtsi
  ARM: at91: at91sam9x5: correct typo error for ohci clock

Signed-off-by: Olof Johansson <olof@lixom.net>
---

054388947ca926260248774819858ee2dbbc735d