summaryrefslogtreecommitdiff
path: root/drivers/media/video/stk-webcam.c
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2008-05-19 16:40:30 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2008-05-19 16:40:30 -0700
commit8033c6e9736c29cce5f0d0abbca9a44dffb20c39 (patch)
tree7691061eecc2884c617f56ab69af1e0592268d61 /drivers/media/video/stk-webcam.c
parent2d3cf588e9bf6df0a22581baece7edeacfbbc9f5 (diff)
parente5c0ef90e6cfd40c819bd70748d675067ff862e7 (diff)
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/drzeus/mmctip-x86-numa-fixes-2008-05-26_08_53_Mon
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/drzeus/mmc: at91_mci: minor cleanup mmc: mmc host test driver mmc: Fix omap compile by replacing dev_name with dma_dev_name
Diffstat (limited to 'drivers/media/video/stk-webcam.c')
0 files changed, 0 insertions, 0 deletions