Merge tag 'v3.18-rc4' into patchwork

Needed due to some important regression fixes at RC core.

* commit 'v3.18-rc4': (587 commits)
  Linux 3.18-rc4
  ARM: dts: zynq: Enable PL clocks for Parallella
  tiny: rename ENABLE_DEV_COREDUMP to ALLOW_DEV_COREDUMP
  tiny: reverse logic for DISABLE_DEV_COREDUMP
  i2c: core: Dispose OF IRQ mapping at client removal time
  i2c: at91: don't account as iowait
  i2c: remove FSF address
  USB: Update default usb-storage delay_use value in kernel-parameters.txt
  sysfs: driver core: Fix glue dir race condition by gdp_mutex
  MIPS: Fix build with binutils 2.24.51+
  xfs: track bulkstat progress by agino
  xfs: bulkstat error handling is broken
  xfs: bulkstat main loop logic is a mess
  xfs: bulkstat chunk-formatter has issues
  xfs: bulkstat chunk formatting cursor is broken
  xfs: bulkstat btree walk doesn't terminate
  mm: Fix comment before truncate_setsize()
  USB: cdc-acm: add quirk for control-line state requests
  tty: Fix pty master poll() after slave closes v2
  MIPS: R3000: Fix debug output for Virtual page number
  ...

Conflicts:
	drivers/media/rc/rc-main.c

diff --cc MAINTAINERS
Simple merge

diff --cc drivers/media/dvb-frontends/sp2.c
Simple merge

diff --cc drivers/media/rc/rc-main.c
index 66eabc5dd000a762985481b8cae26d68400c6a1e,8d3b74c5a71766b5c79eceecc6b68d9a9b93ff0f..97dd6921edbe711ee5851a611eda54407d152457
--- 1/drivers/media/rc/rc-main.c
--- 2/drivers/media/rc/rc-main.c
+++ b/drivers/media/rc/rc-main.c
@@@ -1423,7 -1420,9 +1423,9 @@@ int rc_register_device(struct rc_dev *d
        }
  
        if (dev->change_protocol) {
 -              u64 rc_type = (1 << rc_map->rc_type);
 +              u64 rc_type = (1ll << rc_map->rc_type);
+               if (dev->driver_type == RC_DRIVER_IR_RAW)
+                       rc_type |= RC_BIT_LIRC;
                rc = dev->change_protocol(dev, &rc_type);
                if (rc < 0)
                        goto out_raw;