Merge tag 'omap-fixes-for-v3.5-rc4' of git://git.kernel.org/pub/scm/linux/kernel...
authorOlof Johansson <olof@lixom.net>
Sat, 30 Jun 2012 22:21:00 +0000 (15:21 -0700)
committerOlof Johansson <olof@lixom.net>
Sat, 30 Jun 2012 22:21:00 +0000 (15:21 -0700)
commite5a5192a5e42edca10c9d5e391e6f9fdd11f28ea
treec8460317d779232a169546d2b8278b89e406fc29
parentacf6a7ecbddfc84c66408ac549509d97c2ab4f8a
parente90b833ee1aae64b6fca2455001323ffe29e1698
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