From: Tony Lindgren <tony@atomide.com>
Date: Fri, 9 Mar 2012 01:28:28 +0000 (-0800)
Subject: Merge branch 'hwmod_data_cleanup_3.4' of git://git.pwsan.com/linux-2.6
X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=be3759a0482cfa63a921be4e0f321d249f750959;p=pandora-kernel.git

Merge branch 'hwmod_data_cleanup_3.4' of git://git.pwsan.com/linux-2.6

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

be3759a0482cfa63a921be4e0f321d249f750959
Reading git-diff-tree failed