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: 18408dd 39e6dd7)

author	Ingo Molnar <mingo@elte.hu>
	Sat, 15 Aug 2009 10:06:12 +0000 (12:06 +0200)
committer	Ingo Molnar <mingo@elte.hu>
	Sat, 15 Aug 2009 10:06:12 +0000 (12:06 +0200)
commit	be750231ce1599b86fbba213e3da8344ece262e2
tree	a506c461082692bb5bab8b9bb63a762816329454	tree \| snapshot (tar.gz zip)
parent	18408ddc01136f505ae357c03f0d8e50b10e0db6	commit \| diff
parent	39e6dd73502f64e2ae3236b304e160ae30de9384	commit \| diff

Merge branch 'perfcounters/urgent' into perfcounters/core

Conflicts:
kernel/perf_counter.c

Merge reason: update to latest upstream (-rc6) and resolve
the conflict with urgent fixes.

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