From: Olof Johansson <olof@lixom.net>
Date: Tue, 18 Dec 2012 02:39:47 +0000 (-0800)
Subject: Merge tag 'omap-for-v3.8/fixes-for-merge-window-v4-signed' of git://git.kernel.org... 
X-Git-Tag: upstream/snapshot3+hdmi~5990^2~2
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=a93178a13dbd35850ec8a86b023e1f8953e80dae;p=platform%2Fadaptation%2Frenesas_rcar%2Frenesas_kernel.git

Merge tag 'omap-for-v3.8/fixes-for-merge-window-v4-signed' of git://git./linux/kernel/git/tmlind/linux-omap into fixes

From Tony Lindgren:

These patches fixes a build error caused by a merge
conflict with the fb code, few timer warnings, and longer
term regressions for tfp410 and omap h4 ethernet. Also
included is a GPIO mode fix for the legacy mux code.

* tag 'omap-for-v3.8/fixes-for-merge-window-v4-signed' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap:
  ARM: OMAP2+: common: remove use of vram
  ARM: OMAP: Move plat/omap-serial.h to include/linux/platform_data/serial-omap.h
  ARM: dts: Add build target for omap4-panda-a4
  ARM: dts: OMAP2420: Correct H4 board memory size
  mfd: omap-usb-host: get rid of cpu_is_omap..() macros
  ARM: OMAP: Remove debug-devices.c
  ARM: OMAP2420: Fix ethernet support for OMAP2420 H4
  OMAP2+: mux: Fixed gpio mux mode analysis
  OMAP: board-files: fix i2c_bus for tfp410
  ARM: OMAP2+: Fix sparse warnings in timer.c
  ARM: AM335x: Fix warning in timer.c
  ARM: OMAP2+: Fix realtime_counter_init warning in timer.c
---

a93178a13dbd35850ec8a86b023e1f8953e80dae