git.stricted.de - GitHub/LineageOS/G12/android_kernel_amlogic

author	Robert Richter <robert.richter@amd.com>
	Fri, 23 Apr 2010 14:47:51 +0000 (16:47 +0200)
committer	Robert Richter <robert.richter@amd.com>
	Fri, 23 Apr 2010 14:47:51 +0000 (16:47 +0200)
commit	b971f06187d83b5c03d2b597cccdfef421c0ca91
tree	849dbe485ca9472bea002f94681882ce103fe3cd	tree \| snapshot (tar.gz zip)
parent	cb6e943ccf19ab6d3189147e9d625a992e016084	commit \| diff
parent	c1ab9cab75098924fa8226a8a371de66977439df	commit \| diff

Merge commit 'tip/tracing/core' into oprofile/core

Conflicts:
drivers/oprofile/cpu_buffer.c

Signed-off-by: Robert Richter <robert.richter@amd.com>