git.stricted.de - GitHub/moto-9609/android_kernel_motorola

author	Frederic Weisbecker <fweisbec@gmail.com>
	Fri, 27 Aug 2010 00:28:40 +0000 (02:28 +0200)
committer	Frederic Weisbecker <fweisbec@gmail.com>
	Fri, 27 Aug 2010 00:30:07 +0000 (02:30 +0200)
commit	98ee74a75ca0f047e75400afa712f7bf08268b8e
tree	c87b267f1e279173696f2294b3930940f1a5b570	tree \| snapshot (tar.gz zip)
parent	7de5d895b2020260190db0021de646f3f22f755e	commit \| diff
parent	5225c45899e872383ca39f5533d28ec63c54b39e	commit \| diff

Merge branch 'perf/urgent' into perf/core

Conflicts:
tools/perf/util/callchain.h

Merge reason:
Fix a non-trivial conflict with latest fixes