Merge branch 'android-3.10' into android-merge
authorSumit Singh <sumsingh@nvidia.com>
Tue, 3 Mar 2015 09:57:51 +0000 (14:57 +0530)
committerSumit Singh <sumsingh@nvidia.com>
Wed, 4 Mar 2015 06:36:32 +0000 (11:36 +0530)
commit4f64db21941dea9cda02c58a3c1c86ca832e8ff7
tree5daba3e88552dd00bd5e5a88b240e30d66d83899
parent3f0d5bf57c65c21ed92df1ae8241c11e682834b2
parent0f708442d160846f3e0b0f390c0534e801f7b5f5
Merge branch 'android-3.10' into android-merge

Conflicts:
arch/arm64/Makefile
drivers/Kconfig
drivers/Makefile
drivers/cpufreq/cpufreq_interactive.c
drivers/staging/android/ion/ion.c
fs/pstore/inode.c
fs/pstore/internal.h
fs/pstore/platform.c
fs/pstore/ram.c
include/linux/pstore.h
include/linux/pstore_ram.h
include/linux/wlan_plat.h

bug 200082354

Change-Id: I343eaeb85c02f3c1161e357621a80be0b2566de8
Signed-off-by: Sumit Singh <sumsingh@nvidia.com>
38 files changed:
arch/arm/Kconfig
arch/arm/crypto/aes_glue.c
arch/arm/crypto/sha1_glue.c
arch/arm/include/asm/Kbuild
arch/arm/vfp/vfpmodule.c
arch/arm64/Makefile
drivers/Kconfig
drivers/Makefile
drivers/cpufreq/cpufreq_interactive.c
drivers/staging/android/Kconfig
drivers/staging/android/alarm-dev.c
drivers/staging/android/ion/ion.c
drivers/staging/android/ion/ion_heap.c
drivers/staging/android/ion/ion_priv.h
drivers/staging/android/ion/ion_system_heap.c
drivers/staging/android/logger.c
drivers/staging/android/sync.c
drivers/usb/gadget/android.c
drivers/usb/gadget/f_accessory.c
fs/pstore/Kconfig
fs/pstore/Makefile
fs/pstore/inode.c
fs/pstore/internal.h
fs/pstore/platform.c
fs/pstore/ram.c
include/linux/pstore.h
include/linux/pstore_ram.h
include/linux/wlan_plat.h
include/net/addrconf.h
include/uapi/linux/Kbuild
kernel/irq/pm.c
kernel/power/process.c
kernel/sys.c
net/ipv4/ping.c
net/ipv6/addrconf.c
net/ipv6/route.c
security/selinux/hooks.c
security/selinux/ss/policydb.c