Merge branch 'msm-video' of git://codeaurora.org/quic/kernel/dwalker/linux-msm
authorLinus Torvalds <torvalds@linux-foundation.org>
Fri, 21 May 2010 21:40:30 +0000 (14:40 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Fri, 21 May 2010 21:40:30 +0000 (14:40 -0700)
commitec2a7587e0a91d5c1afe23a0a73edfce06c5e4e0
treefff1da958ffca4d0b17b58ac5bbe22fa486ca106
parentda7806f9b0579a1150f01ade3b562e543ddcbf2c
parentda6df07794d92cd159e28e2cb1947d8b33913e2f
Merge branch 'msm-video' of git://codeaurora.org/quic/kernel/dwalker/linux-msm

* 'msm-video' of git://codeaurora.org/quic/kernel/dwalker/linux-msm:
  drivers: video: msm: add include msm_mdp.h
  drivers: video: msm: default to no
drivers/video/Kconfig