git.baikalelectronics.ru Git - kernel.git/commit

]> git.baikalelectronics.ru Git - kernel.git/commit

projects / kernel.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: 81af4e6 2604979)

author	Ingo Molnar <mingo@kernel.org>
	Mon, 4 Sep 2017 09:01:18 +0000 (11:01 +0200)
committer	Ingo Molnar <mingo@kernel.org>
	Mon, 4 Sep 2017 09:01:18 +0000 (11:01 +0200)
commit	63b84c545dd8c01dd27677c3f94d6f04b05e1cce
tree	b35860428acea35e5866d4cf007519ed943a85de	tree \| snapshot
parent	81af4e63f7d653bd70d57ee0e0fd799cc035cdc1	commit \| diff
parent	260497991d09f61000a47b617673668bd96ca5b0	commit \| diff

Merge branch 'linus' into locking/core, to fix up conflicts

Conflicts:
mm/page_alloc.c

Signed-off-by: Ingo Molnar <mingo@kernel.org>

drivers/gpu/drm/i915/i915_debugfs.c	diff1 \|	diff2 \|	blob \| history
include/linux/blkdev.h	diff1 \|	diff2 \|	blob \| history
include/linux/compiler.h	diff1 \|	diff2 \|	blob \| history
include/linux/netdevice.h	diff1 \|	diff2 \|	blob \| history
kernel/cgroup/cpuset.c	diff1 \|	diff2 \|	blob \| history
kernel/fork.c	diff1 \|	diff2 \|	blob \| history
mm/page_alloc.c	diff1 \|	diff2 \|	blob \| history
net/ipv4/udp.c	diff1 \|	diff2 \|	blob \| history
net/ipv6/udp.c	diff1 \|	diff2 \|	blob \| history

Linux Kernel Source Tree.