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

author	Robert Richter <robert.richter@amd.com>
	Mon, 11 Oct 2010 17:33:42 +0000 (19:33 +0200)
committer	Robert Richter <robert.richter@amd.com>
	Mon, 11 Oct 2010 17:33:42 +0000 (19:33 +0200)
commit	652953b72eea8b9d1bd6b9f67b796c6722bada3a
tree	1620d9c090d8e0c2c65a0c36b632debaef80c484	tree \| snapshot (tar.gz zip)
parent	81771974ae49bf79aab60c42eac7a6d730a9ef2b	commit \| diff
parent	5140434d5f82f2e2119926272ada2e9731ec04f1	commit \| diff

Merge branch 'oprofile/core' (early part) into oprofile/perf

Conflicts:
arch/arm/oprofile/common.c

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