Merge branch 'android-3.10' into 'dev-kernel-3.10'
authorSumit Singh <sumsingh@nvidia.com>
Mon, 11 May 2015 09:17:22 +0000 (14:17 +0530)
committerSumit Singh <sumsingh@nvidia.com>
Mon, 11 May 2015 12:16:58 +0000 (17:16 +0530)
commitd4923d24c30804bfd0356d22959fc9255ec60fe5
treec9f2f2e50fdf8b798b9e4a7f797c6045869c2bbf
parent47ce904961cc56beb63b084e985cf6598286996b
parent98fc0d41be3806ec5ffa160692a39e90b76898f0
Merge branch 'android-3.10' into 'dev-kernel-3.10'

Conflicts:
drivers/misc/Kconfig
drivers/misc/Makefile
drivers/staging/android/Kconfig
drivers/staging/android/alarm-dev.c
drivers/staging/android/logger.c
drivers/staging/android/uapi/android_alarm.h
drivers/usb/gadget/android.c
lib/lz4/lz4_compress.c
lib/lz4/lz4_decompress.c
lib/lz4/lz4hc_compress.c

Bug 200091315

Change-Id: I8e69ba55d2fa8e4f955b2838bb211a8481167670
Signed-off-by: Sumit Singh <sumsingh@nvidia.com>
38 files changed:
Documentation/filesystems/proc.txt
drivers/base/power/wakeup.c
drivers/cpufreq/cpufreq_interactive.c
drivers/md/dm-verity.c
drivers/misc/Kconfig
drivers/misc/Makefile
drivers/staging/android/Kconfig
drivers/staging/android/Makefile
drivers/staging/android/fiq_debugger/fiq_debugger.c
drivers/usb/gadget/Kconfig
drivers/usb/gadget/android.c
fs/debugfs/inode.c
fs/devpts/inode.c
fs/ecryptfs/file.c
fs/ext2/super.c
fs/ext3/super.c
fs/ext4/super.c
fs/fuse/inode.c
fs/hpfs/super.c
fs/nfsd/vfs.c
fs/proc/base.c
fs/proc/root.c
fs/proc/task_mmu.c
fs/pstore/inode.c
fs/reiserfs/super.c
fs/ubifs/super.c
fs/udf/super.c
include/linux/fs.h
include/linux/mm.h
mm/mlock.c
net/ipv4/fib_frontend.c
net/ipv4/fib_semantics.c
net/ipv4/ipmr.c
net/ipv4/ping.c
net/ipv6/ip6mr.c
security/selinux/avc.c
security/selinux/hooks.c
security/selinux/ss/policydb.c