Merge branch 'sirf/cleanup' into next/cleanup
authorArnd Bergmann <arnd@arndb.de>
Fri, 7 Oct 2011 21:07:41 +0000 (23:07 +0200)
committerArnd Bergmann <arnd@arndb.de>
Fri, 7 Oct 2011 21:07:41 +0000 (23:07 +0200)

Trivial merge