From: Olof Johansson <olof@lixom.net>
Date: Thu, 19 Apr 2012 04:24:00 +0000 (-0700)
Subject: Merge tag 'omap-fixes-for-v3.4-rc3' of git://git.kernel.org/pub/scm/linux/kernel... 
X-Git-Tag: v3.4-rc4~2^2~3
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=1c2e1fd1ca4a342a9727c7184703e1d9b03c9720;p=profile%2Fivi%2Fkernel-adaptation-intel-automotive.git

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

Fix regression for bad uart muxing and oops when PM is not set.
Revert one softreset regression and few other minor fixes.

* tag 'omap-fixes-for-v3.4-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap:
  ARM: OMAP1: DMTIMER: fix broken timer clock source selection
  ARM: OMAP: serial: Fix the ocp smart idlemode handling bug
  ARM: OMAP2+: UART: Fix incorrect population of default uart pads
  ARM: OMAP: sram: fix BUG in dpll code for !PM case
  ARM: OMAP2/3: VENC hwmods: Remove OCPIF_SWSUP_IDLE flag from VENC slave interface
  ARM: OMAP2+: hwmod: Revert "ARM: OMAP2+: hwmod: Make omap_hwmod_softreset wait for reset status"
  ARM: OMAP2+: hwmod: add softreset delay field and OMAP4 data
  ARM: OMAP1: mux: add missing include
---

1c2e1fd1ca4a342a9727c7184703e1d9b03c9720