git.agner.ch Git - linux-drm-fsl-dcu.git/commit

projects / linux-drm-fsl-dcu.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: cfb581b 57d5488)

author	Ingo Molnar <mingo@elte.hu>
	Tue, 9 Mar 2010 16:11:53 +0000 (17:11 +0100)
committer	Ingo Molnar <mingo@elte.hu>
	Tue, 9 Mar 2010 16:11:53 +0000 (17:11 +0100)
commit	548b84166917d6f5e2296123b85ad24aecd3801d
tree	0ab0300e23a02df0fe3c0579627e4998bb122c00	tree \| snapshot
parent	cfb581bcd4f8c158c6f2b48bf5e232bb9e6855c0	commit \| diff
parent	57d54889cd00db2752994b389ba714138652e60c	commit \| diff

Merge commit 'v2.6.34-rc1' into perf/urgent

Conflicts:
tools/perf/util/probe-event.c

Merge reason: Pick up -rc1 and resolve the conflict as well.

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

MAINTAINERS	diff1 \|	diff2 \|	blob \| history
arch/x86/kernel/cpu/perf_event.c	diff1 \|	diff2 \|	blob \| history
arch/x86/kernel/cpu/perf_event_intel.c	diff1 \|	diff2 \|	blob \| history
arch/x86/kernel/dumpstack_64.c	diff1 \|	diff2 \|	blob \| history
kernel/perf_event.c	diff1 \|	diff2 \|	blob \| history
lib/Kconfig.debug	diff1 \|	diff2 \|	blob \| history
tools/perf/util/probe-event.c	diff1 \|	diff2 \|	blob \| history

Freescale DCU DRM driver