Merge branches 'fixes-for-linus', 'generic', 'cavium', 'module.h-fixes', 'next/ath79...
authorRalf Baechle <ralf@linux-mips.org>
Sat, 26 May 2012 18:55:48 +0000 (19:55 +0100)
committerRalf Baechle <ralf@linux-mips.org>
Sat, 26 May 2012 18:55:48 +0000 (19:55 +0100)

Trivial merge