Programming Languages Research Group: Git - firefly-linux-kernel-4.4.55.git/commit

projects / firefly-linux-kernel-4.4.55.git / commit

author	Mark Brown <broonie@kernel.org>
	Wed, 5 Nov 2014 14:27:01 +0000 (14:27 +0000)
committer	Mark Brown <broonie@kernel.org>
	Wed, 5 Nov 2014 14:27:01 +0000 (14:27 +0000)
commit	f42afd0e0390a22dec05cda87c195d5d724d3ec8
tree	6db5c9a6eb6d65ee136ba62cf48bfdd38dc0b2f0	tree \| snapshot
parent	71b34fd1db384bb37b092bd6d0cf1b6be4fc7c26	commit \| diff
parent	b7d82dc89e502312c4a819a9005341190fb12d1c	commit \| diff

Merge branch 'linaro-android-3.10-lsk' of git://android.git.linaro.org/kernel/linaro-android into linux-linaro-lsk-android

Conflicts:
arch/arm64/Kconfig
arch/arm64/include/asm/barrier.h
arch/arm64/include/asm/elf.h
arch/arm64/include/asm/ptrace.h
arch/arm64/kernel/Makefile
arch/arm64/kernel/debug-monitors.c
arch/arm64/kernel/entry.S
arch/arm64/kernel/hw_breakpoint.c
arch/arm64/kernel/kuser32.S
arch/arm64/kernel/ptrace.c
arch/arm64/kernel/setup.c
arch/arm64/kernel/traps.c
kernel/fork.c

34 files changed:

MAINTAINERS	diff1 \|	diff2 \|	blob \| history
arch/arm/Kconfig	diff1 \|	diff2 \|	blob \| history
arch/arm/include/asm/barrier.h	diff1 \|	diff2 \|	blob \| history
arch/arm/include/asm/syscall.h	diff1 \|	diff2 \|	blob \| history
arch/arm64/Kconfig	diff1 \|	diff2 \|	blob \| history
arch/arm64/include/asm/compat.h	diff1 \|	diff2 \|	blob \| history
arch/arm64/include/asm/ptrace.h	diff1 \|	diff2 \|	blob \| history
arch/arm64/include/asm/syscall.h	diff1 \|	diff2 \|	blob \| history
arch/arm64/include/asm/thread_info.h	diff1 \|	diff2 \|	blob \| history
arch/arm64/include/asm/unistd.h	diff1 \|	diff2 \|	blob \| history
arch/arm64/kernel/Makefile	diff1 \|	diff2 \|	blob \| history
arch/arm64/kernel/entry.S	diff1 \|	diff2 \|	blob \| history
arch/arm64/kernel/kuser32.S	diff1 \|	diff2 \|	blob \| history
arch/arm64/kernel/process.c	diff1 \|	diff2 \|	blob \| history
arch/arm64/kernel/ptrace.c	diff1 \|	diff2 \|	blob \| history
arch/arm64/kernel/setup.c	diff1 \|	diff2 \|	blob \| history
arch/arm64/kernel/signal32.c	diff1 \|	diff2 \|	blob \| history
arch/arm64/kernel/sys_compat.c	diff1 \|	diff2 \|	blob \| history
arch/arm64/mm/proc.S	diff1 \|	diff2 \|	blob \| history
arch/metag/include/asm/barrier.h	diff1 \|	diff2 \|	blob \| history
arch/mips/kernel/scall32-o32.S	diff1 \|	diff2 \|	blob \| history
arch/mips/kernel/scall64-64.S	diff1 \|	diff2 \|	blob \| history
arch/mips/kernel/scall64-n32.S	diff1 \|	diff2 \|	blob \| history
arch/mips/kernel/scall64-o32.S	diff1 \|	diff2 \|	blob \| history
arch/x86/syscalls/syscall_64.tbl	diff1 \|	diff2 \|	blob \| history
drivers/base/power/main.c	diff1 \|	diff2 \|	blob \| history
drivers/cpufreq/cpufreq_stats.c	diff1 \|	diff2 \|	blob \| history
fs/exec.c	diff1 \|	diff2 \|	blob \| history
include/linux/sched.h	diff1 \|	diff2 \|	blob \| history
kernel/fork.c	diff1 \|	diff2 \|	blob \| history
kernel/irq/pm.c	diff1 \|	diff2 \|	blob \| history
kernel/power/process.c	diff1 \|	diff2 \|	blob \| history
kernel/power/suspend.c	diff1 \|	diff2 \|	blob \| history
net/ipv4/tcp.c	diff1 \|	diff2 \|	blob \| history

Unnamed repository; edit this file 'description' to name the repository.

RSS Atom

MAINTAINERS	diff1 \|	diff2 \|	blob \| history
arch/arm/Kconfig	diff1 \|	diff2 \|	blob \| history
arch/arm/include/asm/barrier.h	diff1 \|	diff2 \|	blob \| history
arch/arm/include/asm/syscall.h	diff1 \|	diff2 \|	blob \| history
arch/arm64/Kconfig	diff1 \|	diff2 \|	blob \| history
arch/arm64/include/asm/compat.h	diff1 \|	diff2 \|	blob \| history
arch/arm64/include/asm/ptrace.h	diff1 \|	diff2 \|	blob \| history
arch/arm64/include/asm/syscall.h	diff1 \|	diff2 \|	blob \| history
arch/arm64/include/asm/thread_info.h	diff1 \|	diff2 \|	blob \| history
arch/arm64/include/asm/unistd.h	diff1 \|	diff2 \|	blob \| history
arch/arm64/kernel/Makefile	diff1 \|	diff2 \|	blob \| history
arch/arm64/kernel/entry.S	diff1 \|	diff2 \|	blob \| history
arch/arm64/kernel/kuser32.S	diff1 \|	diff2 \|	blob \| history
arch/arm64/kernel/process.c	diff1 \|	diff2 \|	blob \| history
arch/arm64/kernel/ptrace.c	diff1 \|	diff2 \|	blob \| history
arch/arm64/kernel/setup.c	diff1 \|	diff2 \|	blob \| history
arch/arm64/kernel/signal32.c	diff1 \|	diff2 \|	blob \| history
arch/arm64/kernel/sys_compat.c	diff1 \|	diff2 \|	blob \| history
arch/arm64/mm/proc.S	diff1 \|	diff2 \|	blob \| history
arch/metag/include/asm/barrier.h	diff1 \|	diff2 \|	blob \| history
arch/mips/kernel/scall32-o32.S	diff1 \|	diff2 \|	blob \| history
arch/mips/kernel/scall64-64.S	diff1 \|	diff2 \|	blob \| history
arch/mips/kernel/scall64-n32.S	diff1 \|	diff2 \|	blob \| history
arch/mips/kernel/scall64-o32.S	diff1 \|	diff2 \|	blob \| history
arch/x86/syscalls/syscall_64.tbl	diff1 \|	diff2 \|	blob \| history
drivers/base/power/main.c	diff1 \|	diff2 \|	blob \| history
drivers/cpufreq/cpufreq_stats.c	diff1 \|	diff2 \|	blob \| history
fs/exec.c	diff1 \|	diff2 \|	blob \| history
include/linux/sched.h	diff1 \|	diff2 \|	blob \| history
kernel/fork.c	diff1 \|	diff2 \|	blob \| history
kernel/irq/pm.c	diff1 \|	diff2 \|	blob \| history
kernel/power/process.c	diff1 \|	diff2 \|	blob \| history
kernel/power/suspend.c	diff1 \|	diff2 \|	blob \| history
net/ipv4/tcp.c	diff1 \|	diff2 \|	blob \| history