Merge branch 'ixp/board' into next/board
authorArnd Bergmann <arnd@arndb.de>
Fri, 30 Sep 2011 20:19:19 +0000 (22:19 +0200)
committerArnd Bergmann <arnd@arndb.de>
Fri, 30 Sep 2011 20:19:19 +0000 (22:19 +0200)

Trivial merge