Merge branch 'next/generic' into mips-for-linux-next

diff --cc arch/mips/cavium-octeon/setup.c
Simple merge

diff --cc arch/mips/kernel/cevt-r4k.c
Simple merge

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

diff --cc arch/mips/lantiq/irq.c
Simple merge

diff --cc arch/mips/sgi-ip27/ip27-irq.c
Simple merge