commit | 4c37a4b53de2d08c469a6e4304cf2a17178200aa | [log] [tgz] |
---|---|---|
author | Linus Torvalds <torvalds@linux-foundation.org> | Mon Jan 03 11:50:26 2011 -0800 |
committer | Linus Torvalds <torvalds@linux-foundation.org> | Mon Jan 03 11:50:26 2011 -0800 |
tree | 6e69ca7a15b14c8acfaa61440d46655bd1060190 | |
parent | d45fa563a62c908d0e9a581d4f091fed6371ebd0 [diff] | |
parent | 8fd0bda511406ef0e9dcce9be055d7ab931e92ba [diff] |
Merge branch 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-2.6 * 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-2.6: [media] em28xx: radio_fops should also use unlocked_ioctl [media] wm8775: Revert changeset fcb9757333 to avoid a regression [media] cx25840: Prevent device probe failure due to volume control ERANGE error