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

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

author	Alex Shi <alex.shi@linaro.org>
	Tue, 11 Jul 2017 06:21:20 +0000 (14:21 +0800)
committer	Alex Shi <alex.shi@linaro.org>
	Tue, 11 Jul 2017 08:22:22 +0000 (16:22 +0800)
commit	2120557722577d8cff75a33a799ad15582dbd8ef
tree	2518d0dd3038f52cc9d4a26200594132e115f829	tree \| snapshot
parent	afd012a6a05f426411186b5ed23c99bb0d83cbe7	commit \| diff
parent	03a929fbcbb1f7dca3cca19eefcbc15ecc191331	commit \| diff

Merge branch 'linux-linaro-lsk-v4.4' into linux-linaro-lsk-v4.4-android

Conflicts:
arch/arm64/kernel/armv8_deprecated.c
arch/arm64/kernel/efi.c
arch/arm64/kernel/entry.S
arch/arm64/kernel/head.S
arch/arm64/kernel/hw_breakpoint.c
arch/arm64/mm/mmu.c
include/linux/memblock.h
mm/memblock.c

44 files changed:

Documentation/kernel-parameters.txt	diff1 \|	diff2 \|	blob \| history
Makefile	diff1 \|	diff2 \|	blob \| history
arch/arm/mm/mmap.c	diff1 \|	diff2 \|	blob \| history
arch/arm64/Kconfig	diff1 \|	diff2 \|	blob \| history
arch/arm64/include/asm/barrier.h	diff1 \|	diff2 \|	blob \| history
arch/arm64/include/asm/uaccess.h	diff1 \|	diff2 \|	blob \| history
arch/arm64/include/asm/virt.h	diff1 \|	diff2 \|	blob \| history
arch/arm64/kernel/Makefile	diff1 \|	diff2 \|	blob \| history
arch/arm64/kernel/armv8_deprecated.c	diff1 \|	diff2 \|	blob \| history
arch/arm64/kernel/asm-offsets.c	diff1 \|	diff2 \|	blob \| history
arch/arm64/kernel/cpufeature.c	diff1 \|	diff2 \|	blob \| history
arch/arm64/kernel/efi.c	diff1 \|	diff2 \|	blob \| history
arch/arm64/kernel/entry.S	diff1 \|	diff2 \|	blob \| history
arch/arm64/kernel/head.S	diff1 \|	diff2 \|	blob \| history
arch/arm64/kernel/hibernate.c	diff1 \|	diff2 \|	blob \| history
arch/arm64/kernel/hw_breakpoint.c	diff1 \|	diff2 \|	blob \| history
arch/arm64/kernel/setup.c	diff1 \|	diff2 \|	blob \| history
arch/arm64/mm/init.c	diff1 \|	diff2 \|	blob \| history
arch/arm64/mm/mmu.c	diff1 \|	diff2 \|	blob \| history
arch/arm64/mm/pageattr.c	diff1 \|	diff2 \|	blob \| history
arch/mips/mm/mmap.c	diff1 \|	diff2 \|	blob \| history
arch/sparc/kernel/sys_sparc_64.c	diff1 \|	diff2 \|	blob \| history
drivers/cpufreq/cpufreq.c	diff1 \|	diff2 \|	blob \| history
drivers/of/fdt.c	diff1 \|	diff2 \|	blob \| history
fs/exec.c	diff1 \|	diff2 \|	blob \| history
fs/ext4/inode.c	diff1 \|	diff2 \|	blob \| history
fs/mpage.c	diff1 \|	diff2 \|	blob \| history
fs/proc/base.c	diff1 \|	diff2 \|	blob \| history
fs/proc/task_mmu.c	diff1 \|	diff2 \|	blob \| history
include/linux/fs.h	diff1 \|	diff2 \|	blob \| history
include/linux/mm.h	diff1 \|	diff2 \|	blob \| history
kernel/cpuset.c	diff1 \|	diff2 \|	blob \| history
kernel/events/core.c	diff1 \|	diff2 \|	blob \| history
kernel/fork.c	diff1 \|	diff2 \|	blob \| history
kernel/time/timekeeping.c	diff1 \|	diff2 \|	blob \| history
mm/mmap.c	diff1 \|	diff2 \|	blob \| history
mm/page_alloc.c	diff1 \|	diff2 \|	blob \| history
net/ipv4/af_inet.c	diff1 \|	diff2 \|	blob \| history
net/ipv6/addrconf.c	diff1 \|	diff2 \|	blob \| history
net/ipv6/datagram.c	diff1 \|	diff2 \|	blob \| history
net/ipv6/ping.c	diff1 \|	diff2 \|	blob \| history
net/ipv6/raw.c	diff1 \|	diff2 \|	blob \| history
net/ipv6/tcp_ipv6.c	diff1 \|	diff2 \|	blob \| history
net/ipv6/udp.c	diff1 \|	diff2 \|	blob \| history

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

RSS Atom

Documentation/kernel-parameters.txt	diff1 \|	diff2 \|	blob \| history
Makefile	diff1 \|	diff2 \|	blob \| history
arch/arm/mm/mmap.c	diff1 \|	diff2 \|	blob \| history
arch/arm64/Kconfig	diff1 \|	diff2 \|	blob \| history
arch/arm64/include/asm/barrier.h	diff1 \|	diff2 \|	blob \| history
arch/arm64/include/asm/uaccess.h	diff1 \|	diff2 \|	blob \| history
arch/arm64/include/asm/virt.h	diff1 \|	diff2 \|	blob \| history
arch/arm64/kernel/Makefile	diff1 \|	diff2 \|	blob \| history
arch/arm64/kernel/armv8_deprecated.c	diff1 \|	diff2 \|	blob \| history
arch/arm64/kernel/asm-offsets.c	diff1 \|	diff2 \|	blob \| history
arch/arm64/kernel/cpufeature.c	diff1 \|	diff2 \|	blob \| history
arch/arm64/kernel/efi.c	diff1 \|	diff2 \|	blob \| history
arch/arm64/kernel/entry.S	diff1 \|	diff2 \|	blob \| history
arch/arm64/kernel/head.S	diff1 \|	diff2 \|	blob \| history
arch/arm64/kernel/hibernate.c	diff1 \|	diff2 \|	blob \| history
arch/arm64/kernel/hw_breakpoint.c	diff1 \|	diff2 \|	blob \| history
arch/arm64/kernel/setup.c	diff1 \|	diff2 \|	blob \| history
arch/arm64/mm/init.c	diff1 \|	diff2 \|	blob \| history
arch/arm64/mm/mmu.c	diff1 \|	diff2 \|	blob \| history
arch/arm64/mm/pageattr.c	diff1 \|	diff2 \|	blob \| history
arch/mips/mm/mmap.c	diff1 \|	diff2 \|	blob \| history
arch/sparc/kernel/sys_sparc_64.c	diff1 \|	diff2 \|	blob \| history
drivers/cpufreq/cpufreq.c	diff1 \|	diff2 \|	blob \| history
drivers/of/fdt.c	diff1 \|	diff2 \|	blob \| history
fs/exec.c	diff1 \|	diff2 \|	blob \| history
fs/ext4/inode.c	diff1 \|	diff2 \|	blob \| history
fs/mpage.c	diff1 \|	diff2 \|	blob \| history
fs/proc/base.c	diff1 \|	diff2 \|	blob \| history
fs/proc/task_mmu.c	diff1 \|	diff2 \|	blob \| history
include/linux/fs.h	diff1 \|	diff2 \|	blob \| history
include/linux/mm.h	diff1 \|	diff2 \|	blob \| history
kernel/cpuset.c	diff1 \|	diff2 \|	blob \| history
kernel/events/core.c	diff1 \|	diff2 \|	blob \| history
kernel/fork.c	diff1 \|	diff2 \|	blob \| history
kernel/time/timekeeping.c	diff1 \|	diff2 \|	blob \| history
mm/mmap.c	diff1 \|	diff2 \|	blob \| history
mm/page_alloc.c	diff1 \|	diff2 \|	blob \| history
net/ipv4/af_inet.c	diff1 \|	diff2 \|	blob \| history
net/ipv6/addrconf.c	diff1 \|	diff2 \|	blob \| history
net/ipv6/datagram.c	diff1 \|	diff2 \|	blob \| history
net/ipv6/ping.c	diff1 \|	diff2 \|	blob \| history
net/ipv6/raw.c	diff1 \|	diff2 \|	blob \| history
net/ipv6/tcp_ipv6.c	diff1 \|	diff2 \|	blob \| history
net/ipv6/udp.c	diff1 \|	diff2 \|	blob \| history