From: Tony Lindgren <tony@atomide.com>
Date: Tue, 22 Feb 2011 18:54:12 +0000 (-0800)
Subject: Merge branch 'for-tony' of git://gitorious.org/usb/usb into omap-for-linus
X-Git-Tag: v2.6.39-rc1~432^2~24
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=04aa67dec63b61c1a8b9b6d001262250f1a92130;p=pandora-kernel.git

Merge branch 'for-tony' of git://gitorious.org/usb/usb into omap-for-linus

Conflicts:
	arch/arm/mach-omap2/omap_hwmod_2430_data.c
	arch/arm/mach-omap2/omap_hwmod_3xxx_data.c
---

04aa67dec63b61c1a8b9b6d001262250f1a92130
Reading git-diff-tree failed