git.stricted.de - GitHub/LineageOS/android_kernel_samsung_universal7580.git/commit

projects / GitHub / LineageOS / android_kernel_samsung_universal7580.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: c62f981 cb655d0)

author	Ingo Molnar <mingo@elte.hu>
	Fri, 8 Oct 2010 08:46:27 +0000 (10:46 +0200)
committer	Ingo Molnar <mingo@elte.hu>
	Fri, 8 Oct 2010 08:46:27 +0000 (10:46 +0200)
commit	7cd2541cf2395962daf98ec32a141aba3398a9b2
tree	3c8bebb277462ba0de9d44233a970d34056dc45e	tree \| snapshot (tar.gz zip)
parent	c62f981f9309486ba5546edbb5925f71e441fa65	commit \| diff
parent	cb655d0f3d57c23db51b981648e452988c0223f9	commit \| diff

Merge commit 'v2.6.36-rc7' into perf/core

Conflicts:
arch/x86/kernel/module.c

Merge reason: Resolve the conflict, pick up fixes.

Signed-off-by: Ingo Molnar <mingo@elte.hu>

Makefile	diff1 \|	diff2 \|	blob \| history
arch/x86/kernel/module.c	diff1 \|	diff2 \|	blob \| history
include/linux/module.h	diff1 \|	diff2 \|	blob \| history
kernel/module.c	diff1 \|	diff2 \|	blob \| history