Merge branch '4.0-fixes' into mips-for-linux-next
authorRalf Baechle <ralf@linux-mips.org>
Mon, 13 Apr 2015 14:03:32 +0000 (16:03 +0200)
committerRalf Baechle <ralf@linux-mips.org>
Mon, 13 Apr 2015 14:03:32 +0000 (16:03 +0200)

Trivial merge