From: Mauro Carvalho Chehab <mchehab@redhat.com>
Date: Thu, 20 Jun 2013 08:19:09 +0000 (-0300)
Subject: Merge branch 'linus' into patchwork
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=37c1d2e4098e48d9107858246027510efcfd7774;p=linux-beck.git

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.
  ...
---

37c1d2e4098e48d9107858246027510efcfd7774
diff --cc drivers/media/platform/coda.c
index c4566c447774,9d1481a60bd9..df4ada880e42
--- a/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/exynos4-is/fimc-isp.c
index e6b0a4b027a9,7ede30b5910f..ecb82a9517f3
--- a/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);