From: Tony Lindgren <tony@atomide.com>
Date: Tue, 10 Jul 2012 07:33:31 +0000 (-0700)
Subject: Merge tag 'omap-cleanup-for-v3.6' into tmp-merge
X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3dd50d0545bd5a8ad83d4339f07935cd3e883271;p=pandora-kernel.git

Merge tag 'omap-cleanup-for-v3.6' into tmp-merge

Here is some more omap clean-up. The biggest changes are
hwmod, clock, and System Control Module cleanup, and the removal
of the last instance of omap_read/write usage for omap2+ with
the removal of unused USB OHCI Full Speed driver support. The
removed OHCI is only currently used for omap1 as the actively
used omap2+ boards have either MUSB or another instance of
OHCI+EHCI that's more usable.

Conflicts:
	arch/arm/mach-omap2/clockdomains3xxx_data.c
---

3dd50d0545bd5a8ad83d4339f07935cd3e883271
Reading git-diff-tree failed