From: Olof Johansson <olof@lixom.net>
Date: Fri, 14 Jun 2013 21:25:37 +0000 (-0700)
Subject: Merge tag 'omap-for-v3.10/fixes-v3.10-rc4' of git://git.kernel.org/pub/scm/linux... 
X-Git-Tag: upstream/snapshot3+hdmi~4843^2~16
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=214099b028f42c48461fb2a08e5b8ab419558cbd;p=platform%2Fadaptation%2Frenesas_rcar%2Frenesas_kernel.git

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

Pulling in a set of fixes from Tony Lindgren to resolve conflicts with later
cleanup branch:

A set of small fixes for omaps for the -rc cycle:

- am7303 iva2 reset PM regression fix
- am33xx uart2 dma channel fix
- am33xx gpmc properties fix
- omap44xx rtc wake-up mux fix for nirq pins
- omap36xx clock divider restore fix

There's also one tiny non-critical .dts fix for omap5
timer pwm properties.

* tag 'omap-for-v3.10/fixes-v3.10-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap:
  ARM: omap3: clock: fix wrong container_of in clock36xx.c
  ARM: dts: OMAP5: Fix missing PWM capability to timer nodes
  ARM: dts: omap4-panda|sdp: Fix mux for twl6030 IRQ pin and msecure line
  ARM: dts: AM33xx: Fix properties on gpmc node
  arm: omap2: fix AM33xx hwmod infos for UART2
  + Linux 3.10-rc4

Signed-off-by: Olof Johansson <olof@lixom.net>
---

214099b028f42c48461fb2a08e5b8ab419558cbd