]> pilppa.com Git - linux-2.6-omap-h63xx.git/commitdiff
Merge branch 'oprofile/ring_buffer' into oprofile/oprofile-for-tip
authorRobert Richter <robert.richter@amd.com>
Thu, 8 Jan 2009 13:27:34 +0000 (14:27 +0100)
committerRobert Richter <robert.richter@amd.com>
Thu, 8 Jan 2009 13:27:34 +0000 (14:27 +0100)

Trivial merge