From: Olof Johansson <olof@lixom.net>
Date: Wed, 30 Jan 2013 17:37:10 +0000 (-0800)
Subject: Merge tag 'at91-fixes' of git://github.com/at91linux/linux-at91 into fixes
X-Git-Tag: firefly_0821_release~3680^2~1076^2~6^2~2
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=825bf91edc0666bcc5d80c29742871fa818a5f84;p=firefly-linux-kernel-4.4.55.git

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

From Nicolas Ferre:
Two little Device Tree fixes for USART on at91sam9x5.

* tag 'at91-fixes' of git://github.com/at91linux/linux-at91:
  ARM: at91/at91sam9x5.dtsi: fix usart3 TXD
  ARM: at91: at91sam9x5: fix usart3 pinctrl name
---

825bf91edc0666bcc5d80c29742871fa818a5f84