Merge branch 'at91-fixes' of git://github.com/at91linux/linux-at91 into fixes
authorOlof Johansson <olof@lixom.net>
Wed, 9 Nov 2011 16:59:35 +0000 (08:59 -0800)
committerOlof Johansson <olof@lixom.net>
Wed, 9 Nov 2011 16:59:35 +0000 (08:59 -0800)

Trivial merge