Merge branch 'oprofile/urgent' into HEAD
authorRobert Richter <robert.richter@amd.com>
Wed, 15 Jun 2011 12:37:35 +0000 (14:37 +0200)
committerRobert Richter <robert.richter@amd.com>
Wed, 15 Jun 2011 12:37:35 +0000 (14:37 +0200)

Trivial merge