]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge /home/v4l/v4l/patchwork
authorMauro Carvalho Chehab <mchehab@redhat.com>
Sat, 7 Jul 2012 03:14:53 +0000 (00:14 -0300)
committerMauro Carvalho Chehab <mchehab@redhat.com>
Sat, 7 Jul 2012 03:14:53 +0000 (00:14 -0300)
commit6e267ee820bd7c4f229095751e9fd0b973f2c115
tree8b18d75a9bedb354727a824f23f44f37999399cc
parentbbfee50f464aee05b99bfdc9513cc02eee2b95b4
parent563cd5cec48b1cad04397a13dec0a2ab666ea95c
Merge /home/v4l/v4l/patchwork

* /home/v4l/v4l/patchwork:
  [media] media: Use pr_info not homegrown pr_reg macro
  [media] Terratec Cinergy S2 USB HD Rev.2
  [media] v4l: Correct conflicting V4L2 subdev selection API documentation
  [media] Feature removal: V4L2 selections API target and flag definitions
  [media] v4l: Unify selection flags documentation
  [media] v4l: Unify selection flags
  [media] v4l: Common documentation for selection targets
  [media] v4l: Unify selection targets across V4L2 and V4L2 subdev interfaces
  [media] v4l: Remove "_ACTUAL" from subdev selection API target definition names
  [media] V4L: Remove "_ACTIVE" from the selection target name definitions

Conflicts:
Documentation/feature-removal-schedule.txt
Documentation/feature-removal-schedule.txt
drivers/media/video/omap3isp/isppreview.c
drivers/media/video/s5p-fimc/fimc-capture.c
drivers/media/video/s5p-fimc/fimc-lite.c
drivers/media/video/smiapp/smiapp-core.c