Merge branch develop-3.10

diff --cc arch/arm/Kconfig
Simple merge

diff --cc arch/arm/mach-rockchip/Kconfig
index 30f5dc3b0e52e2bfa0a14f28688bf5b492ba459f,24b25bc5cf9551d55ed18102edaaccaa3b243e27..fce1583eb46aaffe8a4ef712a6d32f11334a7d75
--- 1/arch/arm/mach-rockchip/Kconfig
--- 2/arch/arm/mach-rockchip/Kconfig
+++ b/arch/arm/mach-rockchip/Kconfig
@@@ -21,5 -21,66 +21,6 @@@ config ARCH_ROCKCHI
        select PL330_DMA
        select FIQ_GLUE
        select ARM_ERRATA_818325
+       select ARM_ERRATA_821420
  
 -if ARCH_ROCKCHIP
 -
 -config RK_LAST_LOG
 -      bool "Save the last kernel log on /proc/last_log"
 -      depends on DEBUG_KERNEL && PRINTK
 -      default y
 -      help
 -        It is only intended for debugging.
 -
 -config RK_DEBUG_UART
 -      int "Debug UART"
 -      default 2
 -      help
 -        Select a UART for debugging. -1 disable.
 -
 -config RK_USB_UART
 -        bool "Support USB UART Bypass Function"
 -        depends on (RK_DEBUG_UART = 2) 
 -
 -config RK_CONSOLE_THREAD
 -      bool "Console write by thread"
 -      depends on FIQ_DEBUGGER_CONSOLE
 -      default y
 -      help
 -        Normal kernel printk will write out to UART by "kconsole" kthread
 -
 -config BLOCK_RKNAND
 -      tristate "RK NAND Device Support"
 -      default n
 -      help
 -        RK NAND Device Support.
 -
 -config RK_FPGA
 -      bool "FPGA Board"
 -
 -config DVFS
 -        bool "Enable dvfs"
 -      default y
 -      select PM_OPP
 -      select CPU_FREQ
 -
 -config RK_PM_TESTS
 -      bool "/sys/pm_tests/ support"
 -      default n
 -      select DVFS
 -      select WATCHDOG
 -
 -config DDR_TEST
 -      bool "DDR Test"
 -      select CRC32
 -      default n
 -
 -config RK_VCODEC
 -      tristate "VCODEC (VPU HEVC) service driver in kernel"
 -      depends on ARCH_ROCKCHIP
 -      default y
 -
 -config RK_PL330_DMA_TEST
 -      bool "pl330 DMA memcpy test"
 -
 -endif
 +source "arch/arm/mach-rockchip/Kconfig.common"

diff --cc arch/arm/mm/proc-v7.S
Simple merge

diff --cc drivers/usb/dwc_otg_310/dwc_otg_driver.c
Simple merge

diff --cc drivers/video/rockchip/rk_fb.c
index 9ba1230d55285f60cfdab57ce68a098c0593f9bb,041a40b9eefa47d1d0736da774a7bd15ef96330a..5779256a67c5a1d94c61e19dbf0450acd6d41c9f
mode 100644,100755..100644
--- 1/drivers/video/rockchip/rk_fb.c
--- 2/drivers/video/rockchip/rk_fb.c
+++ b/drivers/video/rockchip/rk_fb.c

diff --cc drivers/video/rockchip/transmitter/rk31xx_lvds.c
index 3b7cc5a9ee68cd6c3186709212924425286b81cc,85003fe00926c80f42bafc1a4039a1eed377ffaa..c60b971ff5992088fa35deff0b209c09ca45d033
mode 100644,100755..100644
--- 1/drivers/video/rockchip/transmitter/rk31xx_lvds.c
--- 2/drivers/video/rockchip/transmitter/rk31xx_lvds.c
+++ b/drivers/video/rockchip/transmitter/rk31xx_lvds.c

diff --cc include/linux/rk_fb.h
index b1ad85a314f4c5eae1a87862d072c0c3a1d71c65,657fbef59aa6234aca47aa9f2f8fa2285b6c501b..002b7c0838ac2e464eb7f9a77e2bf731ce3bf384
mode 100644,100755..100644
--- 1/include/linux/rk_fb.h
--- 2/include/linux/rk_fb.h
+++ b/include/linux/rk_fb.h

diff --cc kernel/exit.c
Simple merge