]> 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: b47fad3 dbd1e66)
Merge branch 'oprofile/core' into oprofile/x86
authorRobert Richter <robert.richter@amd.com>
Mon, 25 Oct 2010 14:58:34 +0000 (16:58 +0200)
committerRobert Richter <robert.richter@amd.com>
Mon, 25 Oct 2010 14:58:34 +0000 (16:58 +0200)
Conflicts:
arch/x86/oprofile/op_model_amd.c

Signed-off-by: Robert Richter <robert.richter@amd.com>
1  2 
arch/x86/oprofile/op_model_amd.c patch | diff1 | diff2 | blob | history

diff --cc arch/x86/oprofile/op_model_amd.c
Simple merge
Clone of davem's net-next-2.6 tree