Merge tag 'v3.10.40' into android-3.10

This is the 3.10.40 stable release

diff --cc arch/arm/include/asm/cacheflush.h
Simple merge

diff --cc arch/arm/mm/mmu.c
Simple merge

diff --cc drivers/acpi/sleep.c
Simple merge

diff --cc drivers/cpufreq/cpufreq.c
Simple merge

diff --cc drivers/cpufreq/cpufreq_governor.c
Simple merge

diff --cc drivers/input/tablet/wacom_sys.c
Simple merge

diff --cc drivers/media/usb/uvc/uvc_video.c
Simple merge

diff --cc drivers/net/usb/usbnet.c
Simple merge

diff --cc drivers/staging/android/binder.c
Simple merge

diff --cc drivers/tty/vt/vt.c
Simple merge

diff --cc fs/fs-writeback.c
Simple merge

diff --cc fs/nfs/nfs4proc.c
Simple merge

diff --cc fs/proc/base.c
Simple merge

diff --cc include/linux/cpufreq.h
Simple merge

diff --cc include/linux/mm.h
Simple merge

diff --cc include/net/tcp.h
Simple merge

diff --cc init/Kconfig
Simple merge

diff --cc kernel/exit.c
Simple merge

diff --cc kernel/futex.c
Simple merge

diff --cc kernel/sysctl.c
Simple merge

diff --cc mm/mlock.c
Simple merge

diff --cc mm/page_alloc.c
Simple merge

diff --cc net/bluetooth/hci_event.c
index 49d5c94,cfca44f..cb6e369
mode 100755,100644..100755
--- 1/net/bluetooth/hci_event.c
--- 2/net/bluetooth/hci_event.c
+++ b/net/bluetooth/hci_event.c

diff --cc net/ipv4/devinet.c
Simple merge

diff --cc net/ipv4/tcp.c
Simple merge

diff --cc net/ipv6/exthdrs_core.c
Simple merge

diff --cc net/unix/af_unix.c
Simple merge

diff --cc security/selinux/hooks.c
Simple merge

diff --cc sound/pci/hda/patch_realtek.c
Simple merge