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

projects / GitHub / LineageOS / android_kernel_motorola_exynos9610.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: b4f9f2b 0ef5bf1)

author	Ingo Molnar <mingo@elte.hu>
	Thu, 16 Jun 2011 11:26:23 +0000 (13:26 +0200)
committer	Ingo Molnar <mingo@elte.hu>
	Thu, 16 Jun 2011 11:26:23 +0000 (13:26 +0200)
commit	af07ce3e77d3b24ab1d71fcc5833d41800f23b2b
tree	f464a6df26e0b62ba23c22de954cd58fb9a59aaa	tree \| snapshot (tar.gz zip)
parent	b4f9f2b64aa189c5584f266f4f0343af7a705441	commit \| diff
parent	0ef5bf1cd3bd2e3eacb11fca80efe3674927ed1a	commit \| diff

Merge branch 'tip/perf/core-2' of git://git./linux/kernel/git/rostedt/linux-2.6-trace into perf/core

Conflicts:
Makefile