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
..
2013-04-05 12:22:58 -06:00
2014-01-03 14:39:35 +01:00
2013-06-13 22:12:15 +01:00
2013-03-20 11:27:27 +10:30
2013-12-20 17:02:44 -05:00
2015-01-06 13:54:27 -08:00
2014-01-03 17:28:23 +01:00
2011-03-31 11:26:23 -03:00
2011-05-19 15:59:38 -07:00
2012-10-08 13:50:19 +10:30
2014-01-17 01:47:26 +01:00
2013-09-25 17:17:01 +01:00
2013-11-07 10:47:13 +01:00
2011-06-13 00:04:57 +02:00
2013-08-28 17:00:47 +02:00
2014-02-10 16:01:40 -08:00
2013-03-02 20:09:55 +00:00
2012-09-25 08:59:21 -07:00
2011-04-29 15:38:55 +02:00
2013-07-03 22:58:20 +02:00
2013-09-13 13:06:59 +02:00
2013-04-29 15:54:27 -07:00
2013-02-22 11:52:31 +01:00
2013-09-01 21:24:51 +02:00
2013-11-13 12:09:32 +09:00
2011-05-24 16:07:07 +02:00
2011-02-10 15:23:03 +01:00
2011-08-31 16:12:17 +02:00
2014-01-08 15:21:29 +00:00
2012-10-03 09:03:24 +02:00
2012-10-03 09:03:24 +02:00
2012-10-03 09:03:24 +02:00
2014-03-04 07:55:48 -08:00
2014-02-10 16:01:40 -08:00
2012-06-27 12:44:29 -07:00
2014-01-23 16:36:55 -08:00
2013-05-17 22:10:35 +02:00
2011-11-22 14:47:50 -08:00
2014-03-10 17:26:20 -07:00
2014-09-23 22:26:06 +00:00
2013-11-15 14:09:15 -08:00
2013-12-10 16:49:19 +10:30
2012-10-08 13:50:19 +10:30
2012-10-17 12:25:44 +01:00
2013-03-20 11:27:27 +10:30
2014-09-23 22:26:06 +00:00
2012-10-15 13:01:05 -07:00
2013-05-17 22:10:35 +02:00
2014-09-23 22:26:06 +00:00
2015-02-05 16:34:11 -08:00
2013-09-23 15:45:03 +09:30
2012-12-14 13:05:28 +10:30
2011-04-29 15:55:45 +02:00
2011-07-20 17:08:08 +02:00
2012-07-20 10:36:05 +02:00
2011-01-07 14:31:01 +01:00
2011-05-19 16:55:27 +09:30
2010-10-28 00:59:56 +02:00
2012-03-30 15:23:36 +02:00
2012-11-20 11:58:03 +01:00
2014-07-04 04:16:48 +00:00
2012-08-23 11:24:43 -04:00
2014-07-04 04:16:48 +00:00
2014-01-03 14:48:42 +01:00
2013-10-23 17:13:42 +02:00
2013-01-25 16:55:36 +10:30
2014-01-23 16:36:50 -08:00
2013-11-13 12:09:00 +09:00
2013-11-08 10:57:20 +01:00
2011-01-22 15:50:59 +01:00
2012-04-18 13:13:18 -07:00