Merge branch 'samsung/board' into next/board
authorArnd Bergmann <arnd@arndb.de>
Tue, 20 Sep 2011 20:24:58 +0000 (22:24 +0200)
committerArnd Bergmann <arnd@arndb.de>
Tue, 20 Sep 2011 20:24:58 +0000 (22:24 +0200)

Trivial merge