Merge tag 'v3.9-rc5' into patchwork

Linux 3.9-rc5

* tag 'v3.9-rc5': (1080 commits)
  Linux 3.9-rc5
  Revert "lockdep: check that no locks held at freeze time"
  dw_dmac: adjust slave_id accordingly to request line base
  dmaengine: dw_dma: fix endianess for DT xlate function
  PNP: List Rafael Wysocki as a maintainer
  rbd: don't zero-fill non-image object requests
  ia64 idle: delete stale (*idle)() function pointer
  Btrfs: don't drop path when printing out tree errors in scrub
  target: Fix RESERVATION_CONFLICT status regression for iscsi-target special case
  tcm_vhost: Avoid VIRTIO_RING_F_EVENT_IDX feature bit
  Revert "mm: introduce VM_POPULATE flag to better deal with racy userspace programs"
  usb: ftdi_sio: Add support for Mitsubishi FX-USB-AW/-BD
  mg_disk: fix error return code in mg_probe()
  Btrfs: fix wrong return value of btrfs_lookup_csum()
  Btrfs: fix wrong reservation of csums
  Btrfs: fix double free in the btrfs_qgroup_account_ref()
  Btrfs: limit the global reserve to 512mb
  Btrfs: hold the ordered operations mutex when waiting on ordered extents
  Btrfs: fix space accounting for unlink and rename
  Btrfs: fix space leak when we fail to reserve metadata space
  ...

diff --cc MAINTAINERS
Simple merge

diff --cc drivers/media/pci/bt8xx/bttv-driver.c
Simple merge

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

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

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

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

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

diff --cc drivers/media/v4l2-core/Makefile
index 00c4a1993d587fccc24297cc488ebd6d17ed4efd,768aaf62d5dc300a7b2d7e150265e27035ef15cb..aa50c46314b7456cdc43c565af2d52b5804f26eb
--- 1/drivers/media/v4l2-core/Makefile
--- 2/drivers/media/v4l2-core/Makefile
+++ b/drivers/media/v4l2-core/Makefile
@@@ -9,11 -9,8 +9,11 @@@ videodev-objs  :=      v4l2-dev.o v4l2-ioctl.
  ifeq ($(CONFIG_COMPAT),y)
    videodev-objs += v4l2-compat-ioctl32.o
  endif
 +ifeq ($(CONFIG_OF),y)
 +  videodev-objs += v4l2-of.o
 +endif
  
- obj-$(CONFIG_VIDEO_DEV) += videodev.o
+ obj-$(CONFIG_VIDEO_V4L2) += videodev.o
  obj-$(CONFIG_VIDEO_V4L2_INT_DEVICE) += v4l2-int-device.o
  obj-$(CONFIG_VIDEO_V4L2) += v4l2-common.o
  

diff --cc drivers/mfd/Kconfig
Simple merge