Merge branch 'for-3.2/fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/olof...
authorOlof Johansson <olof@lixom.net>
Wed, 9 Nov 2011 21:38:52 +0000 (13:38 -0800)
committerOlof Johansson <olof@lixom.net>
Wed, 9 Nov 2011 21:38:52 +0000 (13:38 -0800)

Trivial merge