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

Trivial merge