From: Olof Johansson <olof@lixom.net>
Date: Sat, 30 Jun 2012 22:21:00 +0000 (-0700)
Subject: Merge tag 'omap-fixes-for-v3.5-rc4' of git://git.kernel.org/pub/scm/linux/kernel... 
X-Git-Tag: upstream/snapshot3+hdmi~7149^2~2
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=e5a5192a5e42edca10c9d5e391e6f9fdd11f28ea;p=platform%2Fadaptation%2Frenesas_rcar%2Frenesas_kernel.git

Merge tag 'omap-fixes-for-v3.5-rc4' of git://git./linux/kernel/git/tmlind/linux-omap into fixes

From Tony Lindgren:
"Here's one more regression fix that I missed earlier, and a
 trivial fix to get omap4470 booting."

* tag 'omap-fixes-for-v3.5-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap:
  ARM: OMAP4470: Fix OMAP4470 boot failure
  ARM: OMAP2+: nand: fix build error when CONFIG_MTD_ONENAND_OMAP2=n
---

e5a5192a5e42edca10c9d5e391e6f9fdd11f28ea