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