]> nv-tegra.nvidia Code Review - linux-2.6.git/commit
Merge commit 'v2.6.31-rc3'; commit 'tip/oprofile' into oprofile/core
authorRobert Richter <robert.richter@amd.com>
Tue, 14 Jul 2009 13:20:44 +0000 (15:20 +0200)
committerRobert Richter <robert.richter@amd.com>
Tue, 14 Jul 2009 13:20:44 +0000 (15:20 +0200)
commitdebc6a6927dcd833a30750b07a4c2b456b71f1be
treeedd16582c57409e75172e5a397e371d4da88f5fc
parent21e70878215f620fe99ea7d7c74bc641aeec932f
parent6847e154e3cd74fca6084124c097980a7634285a
parent4f6e1fe1d8ba3d9f4fb52dd006da9714d75243cf
Merge commit 'v2.6.31-rc3'; commit 'tip/oprofile' into oprofile/core

Conflicts:
drivers/oprofile/oprofile_stats.c
drivers/usb/otg/Kconfig
drivers/usb/otg/Makefile

Signed-off-by: Robert Richter <robert.richter@amd.com>
arch/x86/oprofile/nmi_int.c