Merge branch 'hwmod' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux...
authorArnd Bergmann <arnd@arndb.de>
Tue, 27 Dec 2011 21:55:48 +0000 (21:55 +0000)
committerArnd Bergmann <arnd@arndb.de>
Tue, 27 Dec 2011 21:55:48 +0000 (21:55 +0000)

Trivial merge