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

Trivial merge