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

Pull media updates from Mauro Carvalho Chehab:
 "This series contain:
   - new i2c video drivers: ml86v7667 (video decoder),
                            ths8200 (video encoder)
   - a new video driver for EasyCap cards based on Fushicai USBTV007
   - Improved support for OF and embedded systems, with V4L2 async
     initialization and a better support for clocks
   - API cleanups on the ioctls used by the v4l2 debug tool
   - Lots of cleanups
   - As usual, several driver improvements and new cards additions
   - Revert two changesets that change the minimal symbol rate for
     stv0399, as request by Manu
   - Update MAINTAINERS and other files to point to my new e-mail"

* 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media: (378 commits)
  MAINTAINERS & ABI: Update to point to my new email
  [media] stb0899: restore minimal rate to 5Mbauds
  [media] exynos4-is: Correct colorspace handling at FIMC-LITE
  [media] exynos4-is: Set valid initial format on FIMC.n subdevs
  [media] exynos4-is: Set valid initial format on FIMC-IS-ISP subdev pads
  [media] exynos4-is: Fix format propagation on FIMC-IS-ISP subdev
  [media] exynos4-is: Set valid initial format at FIMC-LITE
  [media] exynos4-is: Fix format propagation on FIMC-LITE.n subdevs
  [media] MAINTAINERS: Update S5P/Exynos FIMC driver entry
  [media] Documentation: Update driver's directory in video4linux/fimc.txt
  [media] exynos4-is: Change fimc-is firmware file names
  [media] exynos4-is: Add support for Exynos5250 MIPI-CSIS
  [media] exynos4-is: Add Exynos5250 SoC support to fimc-lite driver
  [media] exynos4-is: Drop drvdata handling in fimc-lite for non-dt platforms
  [media] media: i2c: tvp514x: remove manual setting of subdev name
  [media] media: i2c: tvp7002: remove manual setting of subdev name
  [media] mem2mem: set missing v4l2_dev pointer
  [media] wl128x: add missing struct v4l2_device
  [media] tvp514x: Fix init seqeunce
  [media] saa7134: Fix sparse warnings by adding __user annotation
  ...

1 files changed, 7 insertions, 7 deletions

diff --git a/Documentation/ABI/testing/sysfs-devices-edac b/Documentation/ABI/testing/sysfs-devices-edac
index 30ee78aaed75..6568e0010e1a 100644
--- a/Documentation/ABI/testing/sysfs-devices-edac
+++ b/Documentation/ABI/testing/sysfs-devices-edac
@@ -77,7 +77,7 @@ Description:	Read/Write attribute file that controls memory scrubbing.
 
 What:           /sys/devices/system/edac/mc/mc*/max_location
 Date:           April 2012
-Contact:        Mauro Carvalho Chehab <mchehab@redhat.com>
+Contact:        Mauro Carvalho Chehab <m.chehab@samsung.com>
                 linux-edac@vger.kernel.org
 Description:    This attribute file displays the information about the last
                 available memory slot in this memory controller. It is used by
@@ -85,7 +85,7 @@ Description:	This attribute file displays the information about the last
 
 What:           /sys/devices/system/edac/mc/mc*/(dimm|rank)*/size
 Date:           April 2012
-Contact:        Mauro Carvalho Chehab <mchehab@redhat.com>
+Contact:        Mauro Carvalho Chehab <m.chehab@samsung.com>
                 linux-edac@vger.kernel.org
 Description:    This attribute file will display the size of dimm or rank.
                 For dimm*/size, this is the size, in MB of the DIMM memory
@@ -96,14 +96,14 @@ Description:	This attribute file will display the size of dimm or rank.
 
 What:           /sys/devices/system/edac/mc/mc*/(dimm|rank)*/dimm_dev_type
 Date:           April 2012
-Contact:        Mauro Carvalho Chehab <mchehab@redhat.com>
+Contact:        Mauro Carvalho Chehab <m.chehab@samsung.com>
                 linux-edac@vger.kernel.org
 Description:    This attribute file will display what type of DRAM device is
                 being utilized on this DIMM (x1, x2, x4, x8, ...).
 
 What:           /sys/devices/system/edac/mc/mc*/(dimm|rank)*/dimm_edac_mode
 Date:           April 2012
-Contact:        Mauro Carvalho Chehab <mchehab@redhat.com>
+Contact:        Mauro Carvalho Chehab <m.chehab@samsung.com>
                 linux-edac@vger.kernel.org
 Description:    This attribute file will display what type of Error detection
                 and correction is being utilized. For example: S4ECD4ED would
@@ -111,7 +111,7 @@ Description:	This attribute file will display what type of Error detection
 
 What:           /sys/devices/system/edac/mc/mc*/(dimm|rank)*/dimm_label
 Date:           April 2012
-Contact:        Mauro Carvalho Chehab <mchehab@redhat.com>
+Contact:        Mauro Carvalho Chehab <m.chehab@samsung.com>
                 linux-edac@vger.kernel.org
 Description:    This control file allows this DIMM to have a label assigned
                 to it. With this label in the module, when errors occur
@@ -126,14 +126,14 @@ Description:	This control file allows this DIMM to have a label assigned
 
 What:           /sys/devices/system/edac/mc/mc*/(dimm|rank)*/dimm_location
 Date:           April 2012
-Contact:        Mauro Carvalho Chehab <mchehab@redhat.com>
+Contact:        Mauro Carvalho Chehab <m.chehab@samsung.com>
                 linux-edac@vger.kernel.org
 Description:    This attribute file will display the location (csrow/channel,
                 branch/channel/slot or channel/slot) of the dimm or rank.
 
 What:           /sys/devices/system/edac/mc/mc*/(dimm|rank)*/dimm_mem_type
 Date:           April 2012
-Contact:        Mauro Carvalho Chehab <mchehab@redhat.com>
+Contact:        Mauro Carvalho Chehab <m.chehab@samsung.com>
                 linux-edac@vger.kernel.org
 Description:    This attribute file will display what type of memory is
                 currently on this csrow. Normally, either buffered or