Merge branch 'hsmmc' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux...
authorOlof Johansson <olof@lixom.net>
Tue, 13 Dec 2011 20:09:28 +0000 (12:09 -0800)
committerOlof Johansson <olof@lixom.net>
Tue, 13 Dec 2011 20:09:28 +0000 (12:09 -0800)

Trivial merge