tree 6c59d8412ef9328bbe53199b167a781d06781e80
parent c0c3350c3c1171f7aff7373c658aa7d68975bd55
parent 7093bf2b7195541281cb711e31c027a8d826c6df
author Olof Johansson <olof@lixom.net> 1386004568 -0800
committer Olof Johansson <olof@lixom.net> 1386103150 -0800

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

From Nicolas Ferre:
AT91: second round of fixes for 3.13
- reduce IP frequency for I2C on sama5d3
- missing aliases directive for USART3 on 9x5 family
- a PM symbol is missing if !CONFIG_PM

* tag 'at91-fixes' of git://github.com/at91linux/linux-at91:
  ARM: at91: fixed unresolved symbol "at91_pm_set_standby" when built without CONFIG_PM
  ARM: at91: add usart3 alias to dtsi
  ARM: at91: sama5d3: reduce TWI internal clock frequency