tree aea92c8a1a21774a569a047ba3bb60e8c04c740d
parent 39dcfa552c3fd4179f470e0b1f716db6241e95d1
parent dca6b6d18fa4428c4539e45f7a43040e388ab99e
author Linus Torvalds <torvalds@linux-foundation.org> 1305713798 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1305713798 -0700

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