]> pilppa.com Git - linux-2.6-omap-h63xx.git/commitdiff
Merge branch 'oprofile-for-tip' of git://git.kernel.org/pub/scm/linux/kernel/git...
authorIngo Molnar <mingo@elte.hu>
Tue, 30 Sep 2008 10:19:41 +0000 (12:19 +0200)
committerIngo Molnar <mingo@elte.hu>
Tue, 30 Sep 2008 10:28:50 +0000 (12:28 +0200)
Conflicts:
arch/x86/oprofile/nmi_int.c

Signed-off-by: Ingo Molnar <mingo@elte.hu>
1  2 
arch/x86/oprofile/nmi_int.c

Simple merge