Dylan Reid
764212922a
Merge remote-tracking branch 'android-common/android-3.14' into HEAD
* android-common/android-3.14: (587 commits)
input: evdev: fix double free in evdev_release
xt_qtaguid: use sock_gen_put() instead of xt_socket_put_sk()
android: base-cfg: enable ARMV8_DEPRECATED and subfeatures
arm64: kconfig: move emulation option under kernel features
kbuild: make it possible to specify the module output dir
arm64: Emulate SETEND for AArch32 tasks
arm64: Consolidate hotplug notifier for instruction emulation
arm64: kernel: explicitly add include in armv8_deprecated
arm64: Track system support for mixed endian EL0
arm64: Fix up /proc/cpuinfo
arm64: cpuinfo: record cpu system register values
arm64: add MIDR_EL1 field accessors
arm64: fix return code check when changing emulation handler
arm64: Trace emulation of AArch32 legacy instructions
arm64: Emulate CP15 Barrier instructions
arm64: barriers: add dmb barrier
arm64: Port SWP/SWPB emulation support from arm
arm64: Add framework for legacy instruction emulation
arm64: Add AArch32 instruction set condition code checks
arm64: Add support for hooks to handle undefined instructions
...
Reviewed-by: Olof Johansson <olofj@chromium.org>
Signed-off-by: Dylan Reid <dgreid@chromium.org>
Conflicts:
Documentation/cpu-freq/governors.txt
arch/arm/boot/dts/Makefile
arch/arm/include/uapi/asm/unistd.h
arch/arm/kernel/calls.S
arch/arm/kernel/process.c
arch/arm64/Kconfig
arch/arm64/boot/dts/Makefile
arch/arm64/crypto/Makefile
arch/arm64/crypto/aes-glue.c
arch/arm64/include/asm/barrier.h
arch/arm64/include/asm/compat.h
arch/arm64/include/asm/cpufeature.h
arch/arm64/include/asm/ptrace.h
arch/arm64/include/asm/seccomp.h
arch/arm64/include/asm/thread_info.h
arch/arm64/include/asm/unistd32.h
arch/arm64/kernel/Makefile
arch/arm64/kernel/entry.S
arch/arm64/kernel/ptrace.c
arch/arm64/kernel/setup.c
arch/arm64/kernel/signal32.c
arch/x86/syscalls/syscall_32.tbl
arch/x86/syscalls/syscall_64.tbl
drivers/cpufreq/Kconfig
drivers/cpufreq/Makefile
drivers/cpufreq/cpufreq_interactive.c
drivers/usb/gadget/Kconfig
drivers/usb/gadget/Makefile
drivers/usb/gadget/f_rndis.c
fs/pstore/ram.c
include/asm-generic/seccomp.h
include/linux/amba/mmci.h
include/trace/events/cpufreq_interactive.h
kernel/futex.c
kernel/seccomp.c
kernel/sys.c
2015-03-02 14:15:03 -08:00
..
2014-03-19 13:10:30 -07:00
2014-12-19 13:42:16 -08:00
2014-03-19 13:10:29 -07:00
2014-03-19 13:10:30 -07:00
2014-12-17 19:53:35 -08:00
2013-09-27 09:26:20 +03:00
2009-04-01 08:59:26 -07:00
2013-04-04 13:08:07 +03:00
2010-03-12 15:52:34 -08:00
2009-04-01 08:59:27 -07:00
2013-08-09 14:02:42 +03:00
2013-06-03 18:42:32 +10:00
2012-12-20 17:14:26 +00:00
2013-10-16 13:48:08 -07:00
2008-04-28 08:58:41 -07:00
2008-07-24 10:47:40 -07:00
2014-11-06 09:27:55 +00:00
2012-12-20 17:14:26 +00:00
2011-03-31 11:26:23 -03:00
2009-02-05 12:56:48 -08:00
2007-10-16 09:43:14 -07:00
2008-08-26 17:01:12 +01:00
2010-05-24 08:47:38 +09:00
2013-09-20 12:52:33 +03:00
2011-03-31 11:26:23 -03:00
2011-04-26 10:22:59 +02:00
2013-06-27 09:35:35 +03:00
2013-01-24 09:03:48 +01:00
2013-10-31 12:30:36 +02:00
2013-08-30 08:51:11 +03:00
2012-10-17 12:17:18 +03:00
2007-10-16 09:43:18 -07:00
2013-04-29 18:28:18 -07:00
2007-10-16 09:43:18 -07:00
2014-01-17 10:57:43 +02:00
2009-04-01 08:59:26 -07:00
2010-12-21 01:05:43 +09:00
2012-02-21 11:56:19 +00:00
2014-11-06 13:43:26 +00:00
2009-12-04 15:39:52 +01:00
2012-11-21 15:50:01 +01:00
2012-05-13 13:07:59 +00:00
2012-11-21 15:50:02 +01:00
2012-07-19 02:05:22 +02:00
2012-12-20 17:14:26 +00:00
2011-03-31 11:26:23 -03:00
2009-04-07 08:31:08 -07:00
2008-07-24 10:47:36 -07:00
2012-03-01 17:46:27 -08:00
2013-05-31 13:37:36 +10:00
2012-04-22 20:16:50 +02:00
2013-03-21 14:34:33 +02:00