From: Tony Lindgren <tony@atomide.com>
Date: Thu, 5 Jul 2012 09:13:04 +0000 (-0700)
Subject: Merge tag 'omap-devel-f-for-3.6' of git://git.kernel.org/pub/scm/linux/kernel/git... 
X-Git-Tag: firefly_0821_release~3680^2~2390^2~1^2~7
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=ac5b0ea3d;p=firefly-linux-kernel-4.4.55.git

Merge tag 'omap-devel-f-for-3.6' of git://git./linux/kernel/git/pjw/omap-pending into cleanup-part2

Miscellaneous OMAP clock, hwmod, clockdomain, and powerdomain patches
for 3.6.  Mostly small infrastructure improvements, and preparation
for OMAP5 and AM33xx code.

Conflicts:
	arch/arm/mach-omap2/omap_hwmod.c
	arch/arm/plat-omap/include/plat/omap_hwmod.h
---

ac5b0ea3d00d231dd9cedd45636b29defc368a4c