Merge branch 'samsung/board' into next/board
authorArnd Bergmann <arnd@arndb.de>
Fri, 7 Oct 2011 18:00:15 +0000 (20:00 +0200)
committerArnd Bergmann <arnd@arndb.de>
Fri, 7 Oct 2011 18:00:15 +0000 (20:00 +0200)

Trivial merge