Merge branch 'at91-fixes' of git://github.com/at91linux/linux-at91 into fixes
authorArnd Bergmann <arnd@arndb.de>
Tue, 6 Dec 2011 14:14:06 +0000 (14:14 +0000)
committerArnd Bergmann <arnd@arndb.de>
Tue, 6 Dec 2011 14:14:06 +0000 (14:14 +0000)

Trivial merge