Merge commit 'v2.6.36' into oprofile/core
authorRobert Richter <robert.richter@amd.com>
Thu, 21 Oct 2010 09:39:26 +0000 (11:39 +0200)
committerRobert Richter <robert.richter@amd.com>
Thu, 21 Oct 2010 09:39:26 +0000 (11:39 +0200)

Trivial merge