Merge branch 'oprofile/x86-oprofile-for-tip' into oprofile/for-linus
authorRobert Richter <robert.richter@amd.com>
Wed, 22 Oct 2008 10:12:06 +0000 (12:12 +0200)
committerRobert Richter <robert.richter@amd.com>
Wed, 22 Oct 2008 10:12:06 +0000 (12:12 +0200)

Trivial merge