From: Tony Lindgren <tony@atomide.com>
Date: Wed, 4 Apr 2012 23:47:25 +0000 (-0700)
Subject: Merge tag 'omap-fixes-a-for-3.4rc' of git://git.kernel.org/pub/scm/linux/kernel/git... 
X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a9025a89d904de3130ec68c9bafc313810ae2ac5;p=pandora-kernel.git

Merge tag 'omap-fixes-a-for-3.4rc' of git://git./linux/kernel/git/pjw/omap-pending

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

a9025a89d904de3130ec68c9bafc313810ae2ac5
Reading git-diff-tree failed