Merge branches 'tegra/board' and 'at91/board' into next/board
authorArnd Bergmann <arnd@arndb.de>
Sat, 10 Sep 2011 20:58:42 +0000 (22:58 +0200)
committerArnd Bergmann <arnd@arndb.de>
Sat, 10 Sep 2011 20:58:42 +0000 (22:58 +0200)

Trivial merge