Merge commit 'v2.6.31-rc3'; commit 'tip/oprofile' into oprofile/core
Robert Richter [Tue, 14 Jul 2009 13:20:44 +0000 (15:20 +0200)]
Conflicts:
drivers/oprofile/oprofile_stats.c
drivers/usb/otg/Kconfig
drivers/usb/otg/Makefile

Signed-off-by: Robert Richter <robert.richter@amd.com>

1  2  3 
arch/x86/oprofile/nmi_int.c

Simple merge