]> bbs.cooldavid.org Git - net-next-2.6.git/commitdiff
git://bbs.cooldavid.org / net-next-2.6.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 86c8c04 c7a27aa)
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)
1  2 
arch/arm/kernel/perf_event.c patch | diff1 | diff2 | blob | history
kernel/perf_event.c patch | diff1 | diff2 | blob | history

diff --cc arch/arm/kernel/perf_event.c
Simple merge
diff --cc kernel/perf_event.c
Simple merge
Clone of davem's net-next-2.6 tree