]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge /home/v4l/v4l/for_upstream
authorMauro Carvalho Chehab <mchehab@redhat.com>
Sat, 7 Jul 2012 03:13:27 +0000 (00:13 -0300)
committerMauro Carvalho Chehab <mchehab@redhat.com>
Sat, 7 Jul 2012 03:13:27 +0000 (00:13 -0300)
commitbbfee50f464aee05b99bfdc9513cc02eee2b95b4
tree51ac27882133094d486b36611846ff12fab34cd5
parente40bcdf4d10620423e20314f7ee70e03c96cfeda
parentec3ed85f926f4e900bc48cec6e72abbe6475321f
Merge /home/v4l/v4l/for_upstream

* /home/v4l/v4l/for_upstream:
  [media] Revert "[media] V4L: JPEG class documentation corrections"
  [media] s5p-fimc: Add missing FIMC-LITE file operations locking
Documentation/DocBook/media/v4l/controls.xml