linux-next: manual merge of the akpm tree with the mips tree

Hi all, Today's linux-next merge of the akpm tree got a conflict in: arch/mips/mm/c-r4k.c between commit: 3315b6b336c8 ("MIPS: Delete unused flush_cache_sigtramp()") from the mips tree and commit: "arch/mips/mm/c-r4k.c: do not use mmap_sem for gup_fast()" from the akpm tree. I fixed

linux-next: manual merge of the akpm tree with the mips tree

Hi Andrew, Today's linux-next merge of the akpm tree got a conflict in arch/mips/sgi-ip32/ip32-platform.c between commit 2045a53b8e3f ("MIPS: IP32: ip32-platform is not a module") from the mips tree and commit 8076ee8258d6 ("mips: ip32: add platform data hooks to use DS1685 driver") from the akpm

linux-next: manual merge of the akpm tree with the mips tree

Hi Andrew, Today's linux-next merge of the akpm tree got a conflict in arch/mips/sgi-ip32/ip32-platform.c between commit 2045a53b8e3f (MIPS: IP32: ip32-platform is not a module) from the mips tree and commit 8076ee8258d6 (mips: ip32: add platform data hooks to use DS1685 driver) from the akpm