diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-05-18 06:16:38 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-05-18 06:16:38 -0400 |
| commit | 2e9521fd656f05a716b5294a7dbebd37ced05e43 (patch) | |
| tree | aea92c8a1a21774a569a047ba3bb60e8c04c740d /drivers/watchdog | |
| parent | 39dcfa552c3fd4179f470e0b1f716db6241e95d1 (diff) | |
| parent | dca6b6d18fa4428c4539e45f7a43040e388ab99e (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] V4L: soc-camera: regression fix: calculate .sizeimage in soc_camera.c
[media] v4l2-subdev: fix broken subdev control enumeration
[media] Fix cx88 remote control input
[media] v4l: Release module if subdev registration fails
Diffstat (limited to 'drivers/watchdog')
0 files changed, 0 insertions, 0 deletions