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)
* '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

1  2 
drivers/video/Kconfig

Simple merge