Merge branch 'fixes' into next
authorSebastian Reichel <sre@kernel.org>
Wed, 25 Feb 2015 21:18:48 +0000 (22:18 +0100)
committerSebastian Reichel <sre@kernel.org>
Wed, 25 Feb 2015 21:18:48 +0000 (22:18 +0100)

Trivial merge