projects / firefly-linux-kernel-4.4.55.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: d3a1d03 d2d693d)
Merge branch 'linux-linaro-lsk-v4.4' into linux-linaro-lsk-v4.4-android
authorAlex Shi <alex.shi@linaro.org>
Tue, 20 Sep 2016 07:18:54 +0000 (15:18 +0800)
committerAlex Shi <alex.shi@linaro.org>
Tue, 20 Sep 2016 07:18:54 +0000 (15:18 +0800)
commit5f87c475f82a75e10bc6e249b7471349f1ef1636
treedf697b570c923c722b5ba24f502c6abdbb5e05f1tree | snapshot
parentd3a1d035ef89cfb89cf6e2128d44b95771f2c7b4commit | diff
parentd2d693d1ba7d93ec7c5db8aca2da29a4c91f6782commit | diff
Merge branch 'linux-linaro-lsk-v4.4' into linux-linaro-lsk-v4.4-android

Conflicts:
in fs/proc/task_mmu.c:
looks like vma_get_anon_name() want have a name for anonymous
vma when there is no name used in vma. commit: 586278d78bf
The name show is after any other names, so it maybe covered.
but anyway, it just a show here.
16 files changed:
Documentation/filesystems/proc.txt diff1 | diff2 | blob | history
arch/arm64/Kconfig diff1 | diff2 | blob | history
arch/arm64/mm/mmu.c diff1 | diff2 | blob | history
block/blk-core.c diff1 | diff2 | blob | history
block/genhd.c diff1 | diff2 | blob | history
drivers/char/random.c diff1 | diff2 | blob | history
fs/proc/task_mmu.c diff1 | diff2 | blob | history
include/linux/blkdev.h diff1 | diff2 | blob | history
include/linux/mm.h diff1 | diff2 | blob | history
include/linux/perf_event.h diff1 | diff2 | blob | history
kernel/sched/core.c diff1 | diff2 | blob | history
kernel/sched/cputime.c diff1 | diff2 | blob | history
kernel/sched/fair.c diff1 | diff2 | blob | history
kernel/time/hrtimer.c diff1 | diff2 | blob | history
net/ipv4/udp.c diff1 | diff2 | blob | history
net/ipv6/udp.c diff1 | diff2 | blob | history
Unnamed repository; edit this file 'description' to name the repository.