Merge branch 'at91/defconfig' into fixes
authorArnd Bergmann <arnd@arndb.de>
Thu, 24 Nov 2011 14:58:59 +0000 (14:58 +0000)
committerArnd Bergmann <arnd@arndb.de>
Thu, 24 Nov 2011 14:58:59 +0000 (14:58 +0000)

Trivial merge