Merge branch 'rixi-3.7' of git://git.linux-mips.org/pub/scm/sjhill/linux-sjhill into...
authorRalf Baechle <ralf@linux-mips.org>
Fri, 28 Sep 2012 14:25:52 +0000 (16:25 +0200)
committerRalf Baechle <ralf@linux-mips.org>
Fri, 28 Sep 2012 14:25:52 +0000 (16:25 +0200)

Trivial merge