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>
	Mon, 8 Sep 2014 11:05:48 +0000 (12:05 +0100)
committer	Mark Brown <broonie@kernel.org>
	Mon, 8 Sep 2014 11:05:48 +0000 (12:05 +0100)
commit	bb0dddf6157bc679de9143507375fce3f13fcd00
tree	de120f5da2b49f6c32fb71454a83111a974811a1	tree \| snapshot
parent	4e65656dfa8cfd0660bac70cba7466d04e565ba6	commit \| diff
parent	b60edabe236826e659aa814326b0d9c9ecb294c1	commit \| diff

Merge remote-tracking branch 'lsk/v3.10/topic/aosp' into linux-linaro-lsk-android

Conflicts:
arch/arm64/Kconfig
arch/arm64/crypto/Makefile
arch/arm64/crypto/aes-glue.c
arch/arm64/crypto/ghash-ce-core.S
arch/arm64/crypto/ghash-ce-glue.c
arch/arm64/include/asm/ptrace.h
arch/arm64/include/asm/thread_info.h
arch/arm64/kernel/fpsimd.c
crypto/ablk_helper.c
drivers/base/cpu.c
drivers/hid/hid-core.c
net/ipv4/raw.c

45 files changed:

MAINTAINERS	diff1 \|	diff2 \|	blob \| history
arch/Kconfig	diff1 \|	diff2 \|	blob \| history
arch/arm/Kconfig	diff1 \|	diff2 \|	blob \| history
arch/arm/include/asm/unistd.h	diff1 \|	diff2 \|	blob \| history
arch/arm64/crypto/ghash-ce-core.S	diff1 \|	diff2 \|	blob \| history
arch/arm64/include/asm/processor.h	diff1 \|	diff2 \|	blob \| history
arch/arm64/include/asm/ptrace.h	diff1 \|	diff2 \|	blob \| history
arch/arm64/include/asm/thread_info.h	diff1 \|	diff2 \|	blob \| history
arch/arm64/kernel/entry.S	diff1 \|	diff2 \|	blob \| history
arch/arm64/kernel/fpsimd.c	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/signal.c	diff1 \|	diff2 \|	blob \| history
arch/arm64/kernel/signal32.c	diff1 \|	diff2 \|	blob \| history
arch/arm64/mm/init.c	diff1 \|	diff2 \|	blob \| history
arch/x86/syscalls/syscall_64.tbl	diff1 \|	diff2 \|	blob \| history
drivers/base/cpu.c	diff1 \|	diff2 \|	blob \| history
drivers/cpufreq/cpufreq_interactive.c	diff1 \|	diff2 \|	blob \| history
drivers/cpufreq/cpufreq_stats.c	diff1 \|	diff2 \|	blob \| history
fs/exec.c	diff1 \|	diff2 \|	blob \| history
fs/ext4/ext4.h	diff1 \|	diff2 \|	blob \| history
fs/ext4/ioctl.c	diff1 \|	diff2 \|	blob \| history
fs/ext4/mballoc.c	diff1 \|	diff2 \|	blob \| history
fs/seq_file.c	diff1 \|	diff2 \|	blob \| history
include/linux/mm.h	diff1 \|	diff2 \|	blob \| history
include/linux/syscalls.h	diff1 \|	diff2 \|	blob \| history
include/net/ip.h	diff1 \|	diff2 \|	blob \| history
include/net/ip6_route.h	diff1 \|	diff2 \|	blob \| history
kernel/fork.c	diff1 \|	diff2 \|	blob \| history
net/core/fib_rules.c	diff1 \|	diff2 \|	blob \| history
net/ipv4/fib_frontend.c	diff1 \|	diff2 \|	blob \| history
net/ipv4/ip_output.c	diff1 \|	diff2 \|	blob \| history
net/ipv4/ping.c	diff1 \|	diff2 \|	blob \| history
net/ipv4/raw.c	diff1 \|	diff2 \|	blob \| history
net/ipv4/route.c	diff1 \|	diff2 \|	blob \| history
net/ipv4/udp.c	diff1 \|	diff2 \|	blob \| history
net/ipv6/datagram.c	diff1 \|	diff2 \|	blob \| history
net/ipv6/icmp.c	diff1 \|	diff2 \|	blob \| history
net/ipv6/raw.c	diff1 \|	diff2 \|	blob \| history
net/ipv6/route.c	diff1 \|	diff2 \|	blob \| history
net/ipv6/tcp_ipv6.c	diff1 \|	diff2 \|	blob \| history
net/ipv6/udp.c	diff1 \|	diff2 \|	blob \| history
net/wireless/nl80211.c	diff1 \|	diff2 \|	blob \| history
net/wireless/scan.c	diff1 \|	diff2 \|	blob \| history
security/selinux/hooks.c	diff1 \|	diff2 \|	blob \| history

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

RSS Atom

MAINTAINERS	diff1 \|	diff2 \|	blob \| history
arch/Kconfig	diff1 \|	diff2 \|	blob \| history
arch/arm/Kconfig	diff1 \|	diff2 \|	blob \| history
arch/arm/include/asm/unistd.h	diff1 \|	diff2 \|	blob \| history
arch/arm64/crypto/ghash-ce-core.S	diff1 \|	diff2 \|	blob \| history
arch/arm64/include/asm/processor.h	diff1 \|	diff2 \|	blob \| history
arch/arm64/include/asm/ptrace.h	diff1 \|	diff2 \|	blob \| history
arch/arm64/include/asm/thread_info.h	diff1 \|	diff2 \|	blob \| history
arch/arm64/kernel/entry.S	diff1 \|	diff2 \|	blob \| history
arch/arm64/kernel/fpsimd.c	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/signal.c	diff1 \|	diff2 \|	blob \| history
arch/arm64/kernel/signal32.c	diff1 \|	diff2 \|	blob \| history
arch/arm64/mm/init.c	diff1 \|	diff2 \|	blob \| history
arch/x86/syscalls/syscall_64.tbl	diff1 \|	diff2 \|	blob \| history
drivers/base/cpu.c	diff1 \|	diff2 \|	blob \| history
drivers/cpufreq/cpufreq_interactive.c	diff1 \|	diff2 \|	blob \| history
drivers/cpufreq/cpufreq_stats.c	diff1 \|	diff2 \|	blob \| history
fs/exec.c	diff1 \|	diff2 \|	blob \| history
fs/ext4/ext4.h	diff1 \|	diff2 \|	blob \| history
fs/ext4/ioctl.c	diff1 \|	diff2 \|	blob \| history
fs/ext4/mballoc.c	diff1 \|	diff2 \|	blob \| history
fs/seq_file.c	diff1 \|	diff2 \|	blob \| history
include/linux/mm.h	diff1 \|	diff2 \|	blob \| history
include/linux/syscalls.h	diff1 \|	diff2 \|	blob \| history
include/net/ip.h	diff1 \|	diff2 \|	blob \| history
include/net/ip6_route.h	diff1 \|	diff2 \|	blob \| history
kernel/fork.c	diff1 \|	diff2 \|	blob \| history
net/core/fib_rules.c	diff1 \|	diff2 \|	blob \| history
net/ipv4/fib_frontend.c	diff1 \|	diff2 \|	blob \| history
net/ipv4/ip_output.c	diff1 \|	diff2 \|	blob \| history
net/ipv4/ping.c	diff1 \|	diff2 \|	blob \| history
net/ipv4/raw.c	diff1 \|	diff2 \|	blob \| history
net/ipv4/route.c	diff1 \|	diff2 \|	blob \| history
net/ipv4/udp.c	diff1 \|	diff2 \|	blob \| history
net/ipv6/datagram.c	diff1 \|	diff2 \|	blob \| history
net/ipv6/icmp.c	diff1 \|	diff2 \|	blob \| history
net/ipv6/raw.c	diff1 \|	diff2 \|	blob \| history
net/ipv6/route.c	diff1 \|	diff2 \|	blob \| history
net/ipv6/tcp_ipv6.c	diff1 \|	diff2 \|	blob \| history
net/ipv6/udp.c	diff1 \|	diff2 \|	blob \| history
net/wireless/nl80211.c	diff1 \|	diff2 \|	blob \| history
net/wireless/scan.c	diff1 \|	diff2 \|	blob \| history
security/selinux/hooks.c	diff1 \|	diff2 \|	blob \| history