Merge branch 'next/generic' into mips-for-linux-next
authorRalf Baechle <ralf@linux-mips.org>
Wed, 11 Jan 2012 14:41:47 +0000 (15:41 +0100)
committerRalf Baechle <ralf@linux-mips.org>
Wed, 11 Jan 2012 14:41:47 +0000 (15:41 +0100)

Trivial merge