Merge tag 'at91-fixes' of git://github.com/at91linux/linux-at91 into fixes
authorOlof Johansson <olof@lixom.net>
Fri, 18 Jul 2014 21:39:18 +0000 (14:39 -0700)
committerOlof Johansson <olof@lixom.net>
Fri, 18 Jul 2014 21:39:18 +0000 (14:39 -0700)
commit054388947ca926260248774819858ee2dbbc735d
tree2c3cd263160d21232355fbb9396ed395d84c183a
parent81cca645b67299b606b57a49f54596827ef8b32a
parente0d69e119fc6bf7cc3c9f791478108c1b925bb2e
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>
arch/arm/boot/dts/at91sam9x5.dtsi