projects / linux.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: ed5016d 6252547)
Merge branch 'omap-fixes-urgent' of git://git.linaro.org/people/rmk/linux-arm
authorLinus Torvalds <torvalds@linux-foundation.org>
Mon, 13 Feb 2012 22:15:22 +0000 (14:15 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Mon, 13 Feb 2012 22:15:22 +0000 (14:15 -0800)
commita269c2f5a5ad2b24a19fdd723363daf18394ec85
tree5d5e2871bc83a4def56beb86400c68e6ce1dc27ftree | snapshot
parented5016d772b84348cb86ab3cdbc533bd4812f2bbcommit | diff
parent6252547b8a7acced581b649af4ebf6d65f63a34bcommit | diff
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
Linux Kernel tree with some unpolished code for Colibri/Apalis modules