Merge branch '3.10-fixes' into mips-for-linux-next

diff --cc arch/mips/Kconfig
Simple merge

diff --cc arch/mips/cavium-octeon/Makefile
index b703583779fb0856194df2a9d5892a0cc8aaf1e8,e3fd50cc709cff428fcd97d9273f1d0fcbe40ee4..4e952043c922177590a01540af71304ae51dc120
--- 1/arch/mips/cavium-octeon/Makefile
--- 2/arch/mips/cavium-octeon/Makefile
+++ b/arch/mips/cavium-octeon/Makefile
@@@ -12,8 -12,8 +12,8 @@@
  CFLAGS_octeon-platform.o = -I$(src)/../../../scripts/dtc/libfdt
  CFLAGS_setup.o = -I$(src)/../../../scripts/dtc/libfdt
  
 -obj-y := cpu.o setup.o serial.o octeon-platform.o octeon-irq.o csrc-octeon.o
 +obj-y := cpu.o setup.o octeon-platform.o octeon-irq.o csrc-octeon.o
- obj-y += dma-octeon.o flash_setup.o
+ obj-y += dma-octeon.o
  obj-y += octeon-memcpy.o
  obj-y += executive/
  

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

diff --cc arch/mips/include/asm/mmu_context.h
Simple merge

diff --cc arch/mips/include/uapi/asm/fcntl.h
index 314c79b76d2a7f704247f18018a2b38a407e9868,6e9e74648f98804c91ec4a103833d732006b3f60..6ca432f00860e3bf1c128e0e9d7e3f25ab1e3656
--- 1/arch/mips/include/uapi/asm/fcntl.h
--- 2/arch/mips/include/uapi/asm/fcntl.h
+++ b/arch/mips/include/uapi/asm/fcntl.h
@@@ -5,9 -5,10 +5,10 @@@
   *
   * Copyright (C) 1995, 96, 97, 98, 99, 2003, 05 Ralf Baechle
   */
 -#ifndef _ASM_FCNTL_H
 -#define _ASM_FCNTL_H
 +#ifndef _UAPI_ASM_FCNTL_H
 +#define _UAPI_ASM_FCNTL_H
  
+ #include <asm/sgidefs.h>
  
  #define O_APPEND      0x0008
  #define O_DSYNC               0x0010  /* used to be O_SYNC, see below */

diff --cc arch/mips/kernel/head.S
Simple merge

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

diff --cc arch/mips/pci/pci-ip27.c
Simple merge