Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux...
authorOlof Johansson <olof@lixom.net>
Fri, 16 Dec 2011 04:58:37 +0000 (20:58 -0800)
committerOlof Johansson <olof@lixom.net>
Fri, 16 Dec 2011 04:58:37 +0000 (20:58 -0800)

Trivial merge