]> bbs.cooldavid.org Git - net-next-2.6.git/commitdiff
Merge branch 'x86' of git://git.kernel.org/pub/scm/linux/kernel/git/rric/oprofile...
authorIngo Molnar <mingo@elte.hu>
Mon, 25 Oct 2010 17:17:32 +0000 (19:17 +0200)
committerIngo Molnar <mingo@elte.hu>
Mon, 25 Oct 2010 17:17:32 +0000 (19:17 +0200)
1  2 
arch/x86/oprofile/op_model_amd.c

Simple merge