Merge branch 'linus' into patchwork

* linus: (1465 commits)
  ARM: tegra30: clocks: Fix pciex clock registration
  lseek(fd, n, SEEK_END) does *not* go to eof - n
  Linux 3.10-rc6
  smp.h: Use local_irq_{save,restore}() in !SMP version of on_each_cpu().
  powerpc: Fix missing/delayed calls to irq_work
  powerpc: Fix emulation of illegal instructions on PowerNV platform
  powerpc: Fix stack overflow crash in resume_kernel when ftracing
  snd_pcm_link(): fix a leak...
  use can_lookup() instead of direct checks of ->i_op->lookup
  move exit_task_namespaces() outside of exit_notify()
  fput: task_work_add() can fail if the caller has passed exit_task_work()
  xfs: don't shutdown log recovery on validation errors
  xfs: ensure btree root split sets blkno correctly
  xfs: fix implicit padding in directory and attr CRC formats
  xfs: don't emit v5 superblock warnings on write
  mei: me: clear interrupts on the resume path
  mei: nfc: fix nfc device freeing
  mei: init: Flush scheduled work before resetting the device
  sctp: fully initialize sctp_outq in sctp_outq_init
  netiucv: Hold rtnl between name allocation and device registration.
  ...

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

diff --cc drivers/media/pci/zoran/zoran_driver.c
Simple merge

diff --cc drivers/media/platform/coda.c
index c4566c4477747c80a0abfdd729571a9e973a1eda,9d1481a60bd97d5ce60e8387365a7e22cbc50016..df4ada880e4215519b33cc81ab3cdb5d2c8e6dce
--- 1/drivers/media/platform/coda.c
--- 2/drivers/media/platform/coda.c
+++ b/drivers/media/platform/coda.c
@@@ -650,8 -617,8 +658,9 @@@ static const struct v4l2_ioctl_ops coda
        .vidioc_querybuf        = vidioc_querybuf,
  
        .vidioc_qbuf            = vidioc_qbuf,
 +      .vidioc_expbuf          = vidioc_expbuf,
        .vidioc_dqbuf           = vidioc_dqbuf,
+       .vidioc_create_bufs     = vidioc_create_bufs,
  
        .vidioc_streamon        = vidioc_streamon,
        .vidioc_streamoff       = vidioc_streamoff,

diff --cc drivers/media/platform/davinci/vpbe_display.c
Simple merge

diff --cc drivers/media/platform/exynos4-is/fimc-is-regs.c
Simple merge

diff --cc drivers/media/platform/exynos4-is/fimc-is.c
Simple merge

diff --cc drivers/media/platform/exynos4-is/fimc-is.h
Simple merge

diff --cc drivers/media/platform/exynos4-is/fimc-isp.c
index e6b0a4b027a95122c11f2dd805adf1f26870bca5,7ede30b5910fab78b8c70bf022c565cbc5ab6021..ecb82a9517f3cca2149d4f4eb5655d1752db34ca
--- 1/drivers/media/platform/exynos4-is/fimc-isp.c
--- 2/drivers/media/platform/exynos4-is/fimc-isp.c
+++ b/drivers/media/platform/exynos4-is/fimc-isp.c
@@@ -191,10 -191,10 +191,10 @@@ static int fimc_isp_subdev_set_fmt(stru
        struct v4l2_mbus_framefmt *mf = &fmt->format;
        int ret = 0;
  
 -      v4l2_dbg(1, debug, sd, "%s: pad%d: code: 0x%x, %dx%d\n",
 +      isp_dbg(1, sd, "%s: pad%d: code: 0x%x, %dx%d\n",
                 __func__, fmt->pad, mf->code, mf->width, mf->height);
  
-       mf->colorspace = V4L2_COLORSPACE_JPEG;
+       mf->colorspace = V4L2_COLORSPACE_SRGB;
  
        mutex_lock(&isp->subdev_lock);
        __isp_subdev_try_format(isp, fmt);

diff --cc drivers/media/platform/s5p-mfc/s5p_mfc.c
Simple merge

diff --cc drivers/media/platform/soc_camera/soc_camera.c
Simple merge

diff --cc drivers/media/radio/radio-si476x.c
Simple merge

diff --cc drivers/media/v4l2-core/v4l2-ioctl.c
Simple merge

diff --cc drivers/media/v4l2-core/videobuf2-core.c
Simple merge