diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-02-24 12:32:51 -0800 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-02-24 12:32:51 -0800 |
commit | e98092bedcfff1908ad7a32acc46f13e4d8b2f43 (patch) | |
tree | ab29029aefe73578e73b86b50d747a042aa7ca32 /drivers/ide/serverworks.c | |
parent | 971316f0503a5c50633d07b83b6db2f15a3a5b00 (diff) | |
parent | fda27874de91d5a8b9a018b3bc74b14578994908 (diff) | |
download | linux-e98092bedcfff1908ad7a32acc46f13e4d8b2f43.tar.bz2 |
Merge branch 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media
* 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media:
[media] hdpvr: update picture controls to support firmware versions > 0.15
[media] wl128x: fix build errors when GPIOLIB is not enabled
[media] hdpvr: fix race conditon during start of streaming
[media] omap3isp: Fix crash caused by subdevs now having a pointer to devnodes
[media] imon: don't wedge hardware after early callbacks
Diffstat (limited to 'drivers/ide/serverworks.c')
0 files changed, 0 insertions, 0 deletions