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)
commit0d15504f16f68725e4635aa85411015d1c573b0a
tree748d75062849f1c3ada597715ea4125063c57c48
parent59293c8ad54726150cf6178164311b004d615ce4
parentf78e80209cf143be49f268c340431ae9fa3abb74
Merge branch 'oprofile-for-tip' of git://git./linux/kernel/git/rric/oprofile into oprofile

Conflicts:
arch/x86/oprofile/nmi_int.c

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