Merge tag 'at91-fixes' of git://github.com/at91linux/linux-at91 into fixes
authorOlof Johansson <olof@lixom.net>
Wed, 30 Jan 2013 17:37:10 +0000 (09:37 -0800)
committerOlof Johansson <olof@lixom.net>
Wed, 30 Jan 2013 17:37:10 +0000 (09:37 -0800)
commit825bf91edc0666bcc5d80c29742871fa818a5f84
treeacdb1a57998a73ba7d533d69dc981fae7e5f3df4
parent89e19ffac19498c7de295876fecfd4c8c931bab1
parent7d4cfece23f535b60496d88a717a3d7bfca50187
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