Merge branch 'fixes-dss' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind...
authorArnd Bergmann <arnd@arndb.de>
Thu, 24 Nov 2011 15:58:01 +0000 (15:58 +0000)
committerArnd Bergmann <arnd@arndb.de>
Thu, 24 Nov 2011 15:58:01 +0000 (15:58 +0000)

Trivial merge