]> git.baikalelectronics.ru Git - kernel.git/commit
Merge branch 'oprofile/perf' into oprofile/core
authorRobert Richter <robert.richter@amd.com>
Mon, 11 Oct 2010 17:38:39 +0000 (19:38 +0200)
committerRobert Richter <robert.richter@amd.com>
Mon, 11 Oct 2010 17:38:39 +0000 (19:38 +0200)
commit59fccd5e092b5449e927a4ff1aa0319e4380856a
tree76ca78323ad1d4b1ecf1e8137f6b48eddcbebe3a
parent3dcc0dc062c83e475c9aefa46656d25ec8a4bc1d
parent133c56aaaf17d175fdde9ea5232ac059b9d77215
Merge branch 'oprofile/perf' into oprofile/core

Conflicts:
arch/arm/oprofile/common.c

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