Merge branch 'for-3.3/drivers' of git://git.kernel.org/pub/scm/linux/kernel/git/olof...
authorArnd Bergmann <arnd@arndb.de>
Tue, 27 Dec 2011 23:10:44 +0000 (23:10 +0000)
committerArnd Bergmann <arnd@arndb.de>
Tue, 27 Dec 2011 23:10:44 +0000 (23:10 +0000)

Trivial merge