Merge branch 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab...

Pull media updates from Mauro Carvalho Chehab:
 "This is the first part of the media patches for v3.6.

  This patch series contain:
   - new DVB frontend: rtl2832
   - new video drivers: adv7393
   - some unused files got removed
   - a selection API cleanup between V4L2 and V4L2 subdev API's
   - a major redesign at v4l-ioctl2, in order to clean it up
   - several driver fixes and improvements."

* 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media: (174 commits)
  v4l: Export v4l2-common.h in include/linux/Kbuild
  media: Revert "[media] Terratec Cinergy S2 USB HD Rev.2"
  [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
  [media] media: dvb-usb: print mac address via native %pM
  [media] s5p-tv: Use module_i2c_driver in sii9234_drv.c file
  [media] media: gpio-ir-recv: add allowed_protos for platform data
  [media] s5p-jpeg: Use module_platform_driver in jpeg-core.c file
  [media] saa7134: fix spelling of detach in label
  [media] cx88-blackbird: replace ioctl by unlocked_ioctl
  [media] cx88: don't use current_norm
  [media] cx88: fix a number of v4l2-compliance violations
  ...

diff --cc Documentation/feature-removal-schedule.txt
index 76112dac76592f4454fbdb20d43437079aef6c92,b99803066b7b17a2cc2c885071a7f69c7b224832..e9237fb719507abe070064c7fc62848e7307748d
--- 1/Documentation/feature-removal-schedule.txt
--- 2/Documentation/feature-removal-schedule.txt
+++ b/Documentation/feature-removal-schedule.txt
@@@ -561,42 -561,18 +561,60 @@@ Who:    Sylwester Nawrocki <sylvester.nawr
  
  ----------------------------
  
 +What: cgroup option updates via remount
 +When: March 2013
 +Why:  Remount currently allows changing bound subsystems and
 +      release_agent.  Rebinding is hardly useful as it only works
 +      when the hierarchy is empty and release_agent itself should be
 +      replaced with conventional fsnotify.
 +
 +----------------------------
 +
 +What:  xt_recent rev 0
 +When:  2013
 +Who:   Pablo Neira Ayuso <pablo@netfilter.org>
 +Files: net/netfilter/xt_recent.c
 +
 +----------------------------
 +
 +What: KVM debugfs statistics
 +When: 2013
 +Why:  KVM tracepoints provide mostly equivalent information in a much more
 +        flexible fashion.
 +
 +----------------------------
 +
 +What: at91-mci driver ("CONFIG_MMC_AT91")
 +When: 3.7
 +Why:  There are two mci drivers: at91-mci and atmel-mci. The PDC support
 +      was added to atmel-mci as a first step to support more chips.
 +      Then at91-mci was kept only for old IP versions (on at91rm9200 and
 +      at91sam9261). The support of these IP versions has just been added
 +      to atmel-mci, so atmel-mci can be used for all chips.
 +Who:  Ludovic Desroches <ludovic.desroches@atmel.com>
 +
 +----------------------------
 +
 +What: net/wanrouter/
 +When: June 2013
 +Why:  Unsupported/unmaintained/unused since 2.6
 +
 +----------------------------
++
+ What: V4L2 selections API target rectangle and flags unification, the
+       following definitions will be removed: V4L2_SEL_TGT_CROP_ACTIVE,
+       V4L2_SEL_TGT_COMPOSE_ACTIVE, V4L2_SUBDEV_SEL_*, V4L2_SUBDEV_SEL_FLAG_*
+       in favor of common V4L2_SEL_TGT_* and V4L2_SEL_FLAG_* definitions.
+       For more details see include/linux/v4l2-common.h.
+ When: 3.8
+ Why:  The regular V4L2 selections and the subdev selection API originally
+       defined distinct names for the target rectangles and flags - V4L2_SEL_*
+       and V4L2_SUBDEV_SEL_*. Although, it turned out that the meaning of these
+       target rectangles is virtually identical and the APIs were consolidated
+       to use single set of names - V4L2_SEL_*. This didn't involve any ABI
+       changes. Alias definitions were created for the original ones to avoid
+       any instabilities in the user space interface. After few cycles these
+       backward compatibility definitions will be removed.
+ Who:  Sylwester Nawrocki <sylvester.nawrocki@gmail.com>
++
++----------------------------

diff --cc MAINTAINERS
Simple merge

diff --cc drivers/i2c/i2c-core.c
Simple merge

diff --cc drivers/media/video/v4l2-dev.c
Simple merge

diff --cc include/linux/Kbuild
index 9547daddf8130f7db081edb28dad839c7c652268,ef4cc9429c3a0c556f7d37cb5632e04d527f5bfd..d9a7544748785d020ba77f74392fb1275fbe02fd
--- 1/include/linux/Kbuild
--- 2/include/linux/Kbuild
+++ b/include/linux/Kbuild
@@@ -384,8 -381,8 +384,9 @@@ header-y += unistd.
  header-y += usbdevice_fs.h
  header-y += utime.h
  header-y += utsname.h
 +header-y += uuid.h
  header-y += uvcvideo.h
+ header-y += v4l2-common.h
  header-y += v4l2-dv-timings.h
  header-y += v4l2-mediabus.h
  header-y += v4l2-subdev.h

diff --cc include/linux/i2c.h
Simple merge