Merge branches 'fixes-for-linus', 'generic', 'cavium', 'module.h-fixes', 'next/ath79...

diff --cc arch/mips/Kconfig
Simple merge

diff --cc arch/mips/kernel/traps.c
Simple merge

diff --cc arch/mips/pci/Makefile
Simple merge