summaryrefslogtreecommitdiffstats
path: root/drivers/media/video/uvc/uvc_v4l2.c
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2010-12-17 09:27:30 -0800
committerLinus Torvalds <torvalds@linux-foundation.org>2010-12-17 09:27:30 -0800
commit74280817e5013af83089a5dd511f6fb3b2362e09 (patch)
treed4c9eccad139dc295db915302270d05dff62072c /drivers/media/video/uvc/uvc_v4l2.c
parenta3383e8372c0c11238f9bb9777929bfc3a2d320a (diff)
parent5aad6c5f7733b94e666e3bf8b57beb7bbee15886 (diff)
downloadlinux-74280817e5013af83089a5dd511f6fb3b2362e09.tar.gz
linux-74280817e5013af83089a5dd511f6fb3b2362e09.tar.bz2
linux-74280817e5013af83089a5dd511f6fb3b2362e09.zip
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6: ALSA: hda - Fix conflict of Mic Boot controls ALSA: HDA: Enable subwoofer on Asus G73Jw ALSA: HDA: Fix auto-mute on Lenovo Edge 14 ASoC: Fix bias power down of non-DAPM codec ASoC: WM8580: Fix R8 initial value ASoC: fix deemphasis control in wm8904/55/60 codecs
Diffstat (limited to 'drivers/media/video/uvc/uvc_v4l2.c')
0 files changed, 0 insertions, 0 deletions