Merge remote-tracking branch 'origin/develop-3.0' into develop-3.0-jb

Conflicts:
	include/net/cfg80211.h

diff --cc Makefile
Simple merge

diff --cc arch/arm/Kconfig
Simple merge

diff --cc arch/arm/configs/rk3066_sdk_defconfig
index 45f44bbcccce969302ab163e5d67bd59e308760a,2964f7e38e97323896af71718aa0405b048e9f8b..f1df9c1c8fb8233d1e555cb904b0403a9cc624ce
--- 1/arch/arm/configs/rk3066_sdk_defconfig
--- 2/arch/arm/configs/rk3066_sdk_defconfig
+++ b/arch/arm/configs/rk3066_sdk_defconfig
@@@ -10,7 -10,7 +10,6 @@@ CONFIG_RESOURCE_COUNTERS=
  CONFIG_CGROUP_SCHED=y
  CONFIG_RT_GROUP_SCHED=y
  CONFIG_BLK_DEV_INITRD=y
--CONFIG_CC_OPTIMIZE_FOR_SIZE=y
  CONFIG_PANIC_TIMEOUT=1
  # CONFIG_SYSCTL_SYSCALL is not set
  # CONFIG_ELF_CORE is not set
@@@ -22,10 -22,9 +21,8 @@@ CONFIG_MODULES=
  CONFIG_MODULE_UNLOAD=y
  CONFIG_MODULE_FORCE_UNLOAD=y
  CONFIG_ARCH_RK30=y
- CONFIG_WIFI_CONTROL_FUNC=y
- CONFIG_MACH_RK3066_SDK=y
  CONFIG_CLK_SWITCH_TO_32K=y
- # CONFIG_SWP_EMULATE is not set
+ CONFIG_MACH_RK3066_SDK=y
 -# CONFIG_SWP_EMULATE is not set
  CONFIG_FIQ_DEBUGGER=y
  CONFIG_FIQ_DEBUGGER_NO_SLEEP=y
  CONFIG_FIQ_DEBUGGER_CONSOLE=y
@@@ -57,10 -56,10 +54,12 @@@ CONFIG_VFP=
  CONFIG_NEON=y
  CONFIG_WAKELOCK=y
  CONFIG_PM_RUNTIME=y
++CONFIG_PM_DEBUG=y
  CONFIG_SUSPEND_TIME=y
  CONFIG_NET=y
  CONFIG_PACKET=y
  CONFIG_UNIX=y
++CONFIG_XFRM_USER=y
  CONFIG_NET_KEY=y
  CONFIG_INET=y
  CONFIG_IP_MULTICAST=y
@@@ -80,6 -79,6 +79,7 @@@ CONFIG_IPV6_MIP6=
  CONFIG_IPV6_TUNNEL=y
  CONFIG_IPV6_MULTIPLE_TABLES=y
  CONFIG_NETFILTER=y
++# CONFIG_BRIDGE_NETFILTER is not set
  CONFIG_NF_CONNTRACK=y
  CONFIG_NF_CONNTRACK_EVENTS=y
  CONFIG_NF_CT_PROTO_DCCP=y
@@@ -98,6 -97,6 +98,7 @@@ CONFIG_NF_CT_NETLINK=
  CONFIG_NETFILTER_TPROXY=y
  CONFIG_NETFILTER_XT_TARGET_CLASSIFY=y
  CONFIG_NETFILTER_XT_TARGET_CONNMARK=y
++CONFIG_NETFILTER_XT_TARGET_IDLETIMER=y
  CONFIG_NETFILTER_XT_TARGET_MARK=y
  CONFIG_NETFILTER_XT_TARGET_NFLOG=y
  CONFIG_NETFILTER_XT_TARGET_NFQUEUE=y
@@@ -224,7 -223,7 +225,16 @@@ CONFIG_INPUT_KEYRESET=
  # CONFIG_KEYBOARD_ATKBD is not set
  # CONFIG_INPUT_MOUSE is not set
  CONFIG_INPUT_JOYSTICK=y
++CONFIG_JOYSTICK_XPAD=y
++CONFIG_JOYSTICK_XPAD_FF=y
++CONFIG_JOYSTICK_XPAD_LEDS=y
  CONFIG_INPUT_TABLET=y
++CONFIG_TABLET_USB_ACECAD=y
++CONFIG_TABLET_USB_AIPTEK=y
++CONFIG_TABLET_USB_GTCO=y
++CONFIG_TABLET_USB_HANWANG=y
++CONFIG_TABLET_USB_KBTAB=y
++CONFIG_TABLET_USB_WACOM=y
  CONFIG_INPUT_TOUCHSCREEN=y
  CONFIG_TOUCHSCREEN_GT8XX=y
  CONFIG_INPUT_MISC=y
@@@ -255,6 -254,6 +265,7 @@@ CONFIG_I2C1_CONTROLLER_RK30=
  CONFIG_I2C2_CONTROLLER_RK30=y
  CONFIG_I2C3_CONTROLLER_RK30=y
  CONFIG_I2C4_CONTROLLER_RK30=y
++CONFIG_GPIO_SYSFS=y
  CONFIG_GPIO_WM831X=y
  CONFIG_EXPANDED_GPIO_NUM=0
  CONFIG_EXPANDED_GPIO_IRQ_NUM=0
@@@ -356,8 -356,8 +368,8 @@@ CONFIG_HID_WACOM=
  CONFIG_HID_ZEROPLUS=y
  CONFIG_ZEROPLUS_FF=y
  CONFIG_HID_ZYDACRON=y
--CONFIG_USB=y
  CONFIG_USB_ANNOUNCE_NEW_DEVICES=y
++CONFIG_USB_DEVICEFS=y
  CONFIG_USB_OTG_BLACKLIST_HUB=y
  CONFIG_USB_STORAGE=y
  CONFIG_USB_SERIAL=y
@@@ -402,13 -402,13 +414,12 @@@ CONFIG_NLS_ASCII=
  CONFIG_NLS_ISO8859_1=y
  CONFIG_PRINTK_TIME=y
  CONFIG_MAGIC_SYSRQ=y
--CONFIG_DEBUG_FS=y
  CONFIG_DEBUG_KERNEL=y
--CONFIG_DETECT_HUNG_TASK=y
  # CONFIG_SCHED_DEBUG is not set
  CONFIG_SCHEDSTATS=y
--CONFIG_TIMER_STATS=y
  # CONFIG_DEBUG_PREEMPT is not set
--# CONFIG_FTRACE is not set
++# CONFIG_EVENT_POWER_TRACING_DEPRECATED is not set
++CONFIG_ENABLE_DEFAULT_TRACERS=y
++CONFIG_CRYPTO_SHA256=y
  CONFIG_CRYPTO_TWOFISH=y
  # CONFIG_CRYPTO_ANSI_CPRNG is not set

diff --cc arch/arm/configs/rk30_ds1001b_defconfig
Simple merge

diff --cc arch/arm/configs/rk30_sdk_defconfig
Simple merge

diff --cc drivers/mmc/card/block.c
Simple merge

diff --cc drivers/mmc/core/core.c
Simple merge

diff --cc drivers/mmc/core/sd.c
Simple merge

diff --cc drivers/tty/serial/Kconfig
Simple merge

diff --cc drivers/usb/gadget/android.c
Simple merge

diff --cc drivers/usb/gadget/f_adb.c
Simple merge

diff --cc drivers/usb/serial/option.c
Simple merge

diff --cc include/net/cfg80211.h
index a2a97f34b9cbcc5d112bd339766b54b8a690267f,fc55a37ea6ae79dfb3313c6240acbb45c37a8e95..a2a97f34b9cbcc5d112bd339766b54b8a690267f
mode 100644,100755..100755
--- 1/include/net/cfg80211.h
--- 2/include/net/cfg80211.h
+++ b/include/net/cfg80211.h

diff --cc net/bluetooth/hci_core.c
index f38e633c75466f54438c3bf6cb4550d7806b250f,ca8e80e6e5df73552690a019e6766f59e9cfe9f2..7f3ba322779a56b390ba59aa11f9ca4e93b19134
mode 100644,100755..100755
--- 1/net/bluetooth/hci_core.c
--- 2/net/bluetooth/hci_core.c
+++ b/net/bluetooth/hci_core.c