]> git.baikalelectronics.ru Git - kernel.git/commit
Merge branch 'oprofile/urgent' (early part) into oprofile/perf
authorRobert Richter <robert.richter@amd.com>
Mon, 11 Oct 2010 17:26:50 +0000 (19:26 +0200)
committerRobert Richter <robert.richter@amd.com>
Mon, 11 Oct 2010 17:26:50 +0000 (19:26 +0200)
commit5d4db84a976d613b2d5a3f3137260de489dfbd63
tree2565121e4b9945d953e02c77a2e53065b3789aa4
parent0ab9b8ebd63c64f63ffa565732efadece667673a
parentbff383a8728647a0327c3fabfd7dc3f50e01ff38
Merge branch 'oprofile/urgent' (early part) into oprofile/perf
arch/arm/kernel/perf_event.c
kernel/perf_event.c