diff options
| author | Robert Richter <robert.richter@amd.com> | 2010-10-11 19:33:42 +0200 |
|---|---|---|
| committer | Robert Richter <robert.richter@amd.com> | 2010-10-11 19:33:42 +0200 |
| commit | 652953b72eea8b9d1bd6b9f67b796c6722bada3a (patch) | |
| tree | 1620d9c090d8e0c2c65a0c36b632debaef80c484 /arch/sh | |
| parent | 81771974ae49bf79aab60c42eac7a6d730a9ef2b (diff) | |
| parent | 5140434d5f82f2e2119926272ada2e9731ec04f1 (diff) | |
| download | linux-3.10-652953b72eea8b9d1bd6b9f67b796c6722bada3a.tar.gz linux-3.10-652953b72eea8b9d1bd6b9f67b796c6722bada3a.tar.bz2 linux-3.10-652953b72eea8b9d1bd6b9f67b796c6722bada3a.zip | |
Merge branch 'oprofile/core' (early part) into oprofile/perf
Conflicts:
arch/arm/oprofile/common.c
Signed-off-by: Robert Richter <robert.richter@amd.com>
Diffstat (limited to 'arch/sh')
0 files changed, 0 insertions, 0 deletions