From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Mon, 13 Feb 2012 22:15:22 +0000 (-0800)
Subject: Merge branch 'omap-fixes-urgent' of git://git.linaro.org/people/rmk/linux-arm
X-Git-Tag: accepted/tizen/common/20141203.182822~5304
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=a269c2f5a5ad2b24a19fdd723363daf18394ec85;p=platform%2Fkernel%2Flinux-arm64.git

Merge branch 'omap-fixes-urgent' of git://git.linaro.org/people/rmk/linux-arm

This pull request covers the major oopsing issues with OMAP, caused by
the lack of the TWL driver.  Even when the TWL driver is not built in,
we shouldn't oops.

* 'omap-fixes-urgent' of git://git.linaro.org/people/rmk/linux-arm:
  ARM: omap: fix broken twl-core dependencies and ifdefs
  ARM: omap: fix oops in drivers/video/omap2/dss/dpi.c
  ARM: omap: fix oops in arch/arm/mach-omap2/vp.c when pmic is not found
---

a269c2f5a5ad2b24a19fdd723363daf18394ec85