Merge tag 'v3.9-rc3' into drm-intel-next-queued

Backmerge so that I can merge Imre Deak's coalesced sg entries fixes,
which depend upon the new for_each_sg_page introduce in

commit a321e91b6d73ed011ffceed384c40d2785cf723b
Author: Imre Deak <imre.deak@intel.com>
Date:   Wed Feb 27 17:02:56 2013 -0800

    lib/scatterlist: add simple page iterator

The merge itself is just two trivial conflicts:

Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>

1 files changed, 9 insertions, 2 deletions

diff --git a/include/uapi/linux/v4l2-mediabus.h b/include/uapi/linux/v4l2-mediabus.h
index 7d64e0e1a18b..b9b7bea04537 100644
--- a/include/uapi/linux/v4l2-mediabus.h
+++ b/include/uapi/linux/v4l2-mediabus.h
@@ -47,8 +47,9 @@ enum v4l2_mbus_pixelcode {
         V4L2_MBUS_FMT_RGB565_2X8_BE = 0x1007,
         V4L2_MBUS_FMT_RGB565_2X8_LE = 0x1008,
 
-        /* YUV (including grey) - next is 0x2014 */
+        /* YUV (including grey) - next is 0x2017 */
         V4L2_MBUS_FMT_Y8_1X8 = 0x2001,
+        V4L2_MBUS_FMT_UV8_1X8 = 0x2015,
         V4L2_MBUS_FMT_UYVY8_1_5X8 = 0x2002,
         V4L2_MBUS_FMT_VYUY8_1_5X8 = 0x2003,
         V4L2_MBUS_FMT_YUYV8_1_5X8 = 0x2004,
@@ -65,14 +66,20 @@ enum v4l2_mbus_pixelcode {
         V4L2_MBUS_FMT_VYUY8_1X16 = 0x2010,
         V4L2_MBUS_FMT_YUYV8_1X16 = 0x2011,
         V4L2_MBUS_FMT_YVYU8_1X16 = 0x2012,
+        V4L2_MBUS_FMT_YDYUYDYV8_1X16 = 0x2014,
         V4L2_MBUS_FMT_YUYV10_1X20 = 0x200d,
         V4L2_MBUS_FMT_YVYU10_1X20 = 0x200e,
+        V4L2_MBUS_FMT_YUV10_1X30 = 0x2016,
 
-        /* Bayer - next is 0x3015 */
+        /* Bayer - next is 0x3019 */
         V4L2_MBUS_FMT_SBGGR8_1X8 = 0x3001,
         V4L2_MBUS_FMT_SGBRG8_1X8 = 0x3013,
         V4L2_MBUS_FMT_SGRBG8_1X8 = 0x3002,
         V4L2_MBUS_FMT_SRGGB8_1X8 = 0x3014,
+        V4L2_MBUS_FMT_SBGGR10_ALAW8_1X8 = 0x3015,
+        V4L2_MBUS_FMT_SGBRG10_ALAW8_1X8 = 0x3016,
+        V4L2_MBUS_FMT_SGRBG10_ALAW8_1X8 = 0x3017,
+        V4L2_MBUS_FMT_SRGGB10_ALAW8_1X8 = 0x3018,
         V4L2_MBUS_FMT_SBGGR10_DPCM8_1X8 = 0x300b,
         V4L2_MBUS_FMT_SGBRG10_DPCM8_1X8 = 0x300c,
         V4L2_MBUS_FMT_SGRBG10_DPCM8_1X8 = 0x3009,