From: Ingo Molnar <mingo@elte.hu>
Date: Tue, 30 Sep 2008 10:19:41 +0000 (+0200)
Subject: Merge branch 'oprofile-for-tip' of git://git.kernel.org/pub/scm/linux/kernel/git... 
X-Git-Tag: v2.6.28-rc1~35^2~15
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=0d15504f16f68725e4635aa85411015d1c573b0a;p=linux-2.6-omap-h63xx.git

Merge branch 'oprofile-for-tip' of git://git.kernel.org/pub/scm/linux/kernel/git/rric/oprofile into oprofile

Conflicts:
	arch/x86/oprofile/nmi_int.c

Signed-off-by: Ingo Molnar <mingo@elte.hu>
---

0d15504f16f68725e4635aa85411015d1c573b0a