tree 5d5e2871bc83a4def56beb86400c68e6ce1dc27f
parent ed5016d772b84348cb86ab3cdbc533bd4812f2bb
parent 6252547b8a7acced581b649af4ebf6d65f63a34b
author Linus Torvalds <torvalds@linux-foundation.org> 1329171322 -0800
committer Linus Torvalds <torvalds@linux-foundation.org> 1329171322 -0800

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