Merge branch 'fixes-for-linus' into mips-for-linux-next
authorRalf Baechle <ralf@linux-mips.org>
Wed, 11 Jan 2012 14:40:27 +0000 (15:40 +0100)
committerRalf Baechle <ralf@linux-mips.org>
Wed, 11 Jan 2012 14:40:27 +0000 (15:40 +0100)

Trivial merge