Merge branch 'imx/board' into next/board
authorArnd Bergmann <arnd@arndb.de>
Thu, 20 Oct 2011 13:18:11 +0000 (15:18 +0200)
committerArnd Bergmann <arnd@arndb.de>
Thu, 20 Oct 2011 13:18:11 +0000 (15:18 +0200)

Trivial merge