Merge branch 'master' of git://dev.phrozen.org/mips-next into mips-for-linux-next
authorRalf Baechle <ralf@linux-mips.org>
Fri, 5 Oct 2012 13:56:28 +0000 (15:56 +0200)
committerRalf Baechle <ralf@linux-mips.org>
Fri, 5 Oct 2012 13:56:28 +0000 (15:56 +0200)

Trivial merge