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