]> git.baikalelectronics.ru Git - kernel.git/commit
Merge branch 'oprofile/core' (early part) into oprofile/perf
authorRobert Richter <robert.richter@amd.com>
Mon, 11 Oct 2010 17:33:42 +0000 (19:33 +0200)
committerRobert Richter <robert.richter@amd.com>
Mon, 11 Oct 2010 17:33:42 +0000 (19:33 +0200)
commitc96c3dc699db38fd796da30615e01ae88fdd90b8
tree1620d9c090d8e0c2c65a0c36b632debaef80c484
parentfb2b26b7f661bf824c5780b977e69ea3f8111e24
parent2fadad596c5a361759d7e58b6bf1e0c2ef636674
Merge branch 'oprofile/core' (early part) into oprofile/perf

Conflicts:
arch/arm/oprofile/common.c

Signed-off-by: Robert Richter <robert.richter@amd.com>