]> rtime.felk.cvut.cz Git - lisovros/linux_canprio.git/commitdiff
Merge remote branch 'tip/perf/urgent' into oprofile/urgent
authorRobert Richter <robert.richter@amd.com>
Fri, 4 Jun 2010 09:33:10 +0000 (11:33 +0200)
committerRobert Richter <robert.richter@amd.com>
Fri, 4 Jun 2010 09:33:10 +0000 (11:33 +0200)

Trivial merge