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

author	Robert Richter <robert.richter@amd.com>
	Fri, 1 Oct 2010 06:54:17 +0000 (08:54 +0200)
committer	Robert Richter <robert.richter@amd.com>
	Fri, 1 Oct 2010 06:54:17 +0000 (08:54 +0200)
commit	ef70fcc0cd5d98f5e2df82c9e598b47f351d4f66
tree	b801ba4d7ebb1155df68d530df49444ffa6252cc	tree \| snapshot (tar.gz zip)
parent	4cbe75be5c6ae86bdc7daec864eeb2dfd66f48bb	commit \| diff
parent	98d943b02f6f1b57787ff1aa6f34d019a407e3ee	commit \| diff

Merge branch 'oprofile/urgent' into oprofile/core

Conflicts:
arch/arm/oprofile/common.c

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