Merge branch 'at91/fixes' of git+ssh://master.kernel.org/pub/scm/linux/kernel/git...
Arnd Bergmann [Fri, 26 Aug 2011 15:34:00 +0000 (15:34 +0000)]

Trivial merge