Merge branch 'android-3.10' into rel-21
authorIshan Mittal <imittal@nvidia.com>
Thu, 15 May 2014 12:51:20 +0000 (17:51 +0530)
committerIshan Mittal <imittal@nvidia.com>
Thu, 29 May 2014 07:11:59 +0000 (12:11 +0530)
commit75c1032e7b6215de41e451a01033a342372105d4
tree54fe571dd5a1c1e69f93c219e1cdf9c072e87d88
parentc436d07ff6b15f6540e7468c7c793ef15e55a921
parentc4db79235d21ba1dcd10d42154910ac1ba8e3ed3
Merge branch 'android-3.10' into rel-21

Bug 200004122
Bug 1511804
This merge takes AOSP commits from android-3.10 branch

Change-Id: I07ec2468114db0366d63777142c9572bbfadbc45
Signed-off-by: Ishan Mittal <imittal@nvidia.com>
17 files changed:
arch/arm/common/Kconfig
arch/arm64/Kconfig
arch/arm64/Makefile
arch/arm64/boot/Makefile
arch/arm64/boot/dts/Makefile
drivers/cpufreq/cpufreq_interactive.c
drivers/hid/hid-input.c
drivers/input/Kconfig
drivers/input/Makefile
drivers/of/fdt.c
drivers/staging/android/Kconfig
drivers/usb/gadget/f_accessory.c
drivers/usb/gadget/f_mtp.c
include/linux/of_fdt.h
include/uapi/linux/input.h
net/ipv4/ping.c
security/selinux/hooks.c