tree b801ba4d7ebb1155df68d530df49444ffa6252cc
parent 4cbe75be5c6ae86bdc7daec864eeb2dfd66f48bb
parent 98d943b02f6f1b57787ff1aa6f34d019a407e3ee
author Robert Richter <robert.richter@amd.com> 1285916057 +0200
committer Robert Richter <robert.richter@amd.com> 1285916057 +0200

Merge branch 'oprofile/urgent' into oprofile/core

Conflicts:
	arch/arm/oprofile/common.c

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