From: Robert Richter <robert.richter@amd.com>
Date: Tue, 14 Jul 2009 13:20:44 +0000 (+0200)
Subject: Merge commit 'v2.6.31-rc3'; commit 'tip/oprofile' into oprofile/core
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=debc6a6927dcd833a30750b07a4c2b456b71f1be;p=linux.git

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>
---

debc6a6927dcd833a30750b07a4c2b456b71f1be