Merge commit '840f5b0572ea' into v4l_for_linus

* commit '840f5b0572ea': (381 commits)
  media: au0828 disable tuner to demod link in au0828_media_device_register()
  [media] touptek: cast char types on %x printk
  [media] touptek: don't DMA at the stack
  [media] mceusb: use %*ph for small buffer dumps
  [media] v4l: exynos4-is: Drop unneeded check when setting up fimc-lite links
  [media] v4l: vsp1: Check if an entity is a subdev with the right function
  [media] hide unused functions for !MEDIA_CONTROLLER
  [media] em28xx: fix Terratec Grabby AC97 codec detection
  [media] media: add prefixes to interface types
  [media] media: rc: nuvoton: switch attribute wakeup_data to text
  [media] v4l2-ioctl: fix YUV422P pixel format description
  [media] media: fix null pointer dereference in v4l_vb2q_enable_media_source()
  [media] v4l2-mc.h: fix yet more compiler errors
  [media] staging/media: add missing TODO files
  [media] media.h: always start with 1 for the audio entities
  [media] sound/usb: Use meaninful names for goto labels
  [media] v4l2-mc.h: fix compiler warnings
  [media] media: au0828 audio mixer isn't connected to decoder
  [media] sound/usb: Use Media Controller API to share media resources
  [media] dw2102: add support for TeVii S662
  ...

diff --cc MAINTAINERS
Simple merge

diff --cc drivers/media/media-device.c
Simple merge

diff --cc include/uapi/linux/media.h
index a8e3a8c,52f5834..df59ede
--- 1/include/uapi/linux/media.h
--- 2/include/uapi/linux/media.h
+++ b/include/uapi/linux/media.h
@@@ -355,14 -373,8 +385,8 @@@ struct media_v2_topology 
        __u32 num_links;
        __u32 reserved4;
        __u64 ptr_links;
 -};
 +} __attribute__ ((packed));
  
- static inline void __user *media_get_uptr(__u64 arg)
- {
-       return (void __user *)(uintptr_t)arg;
- }
- #endif
- 
  /* ioctls */
  
  #define MEDIA_IOC_DEVICE_INFO         _IOWR('|', 0x00, struct media_device_info)