Merge branch 'topic-0620/samsung-gscalar-3.4' into chromeos-exynos-3.4
* topic-0620/samsung-gscalar-3.4:
Add V4L2_CID macros for GScaler custom control
media: gscalar: Fix build warnings due to possible uninitialized usage
ARM: EXYNOS: GSCALAR: Add IOMMU mapping to GSC probe
Media: Exynos: Add VB2 modifications for G-Scalar driver
Media: Exynos: Header file support for G-Scaler driver
include: mdev: Add driver_put and module_name_to_driver_data
media: exynos: Fix Tiled format in Gscalar
media: exynos: gscaler: Don't register Gscaler capture device
media: exynos: Add new formats in gscalar driver
media: gscaler: Add new driver for general scaler
UPSTREAM: media: media-dev: Add media devices for EXYNOS5