Merge branch 'fixes-non-critical' of git://git.kernel.org/pub/scm/linux/kernel/git...
authorOlof Johansson <olof@lixom.net>
Tue, 13 Dec 2011 20:10:02 +0000 (12:10 -0800)
committerOlof Johansson <olof@lixom.net>
Tue, 13 Dec 2011 20:10:02 +0000 (12:10 -0800)

Trivial merge