Merge tag 'v3.19-rc6' into patchwork

This is needed in order to get the media fixes applied on -rc6.

Linux 3.19-rc6

* tag 'v3.19-rc6': (891 commits)
  Linux 3.19-rc6
  dm: fix handling of multiple internal suspends
  hwmon: (i5500_temp) Convert to use ATTRIBUTE_GROUPS macro
  hwmon: (i5500_temp) Convert to module_pci_driver
  hwmon: (i5500_temp) Don't bind to disabled sensors
  hwmon: (i5500_temp) Convert to devm_hwmon_device_register_with_groups
  hwmon: (i5500_temp) New driver for the Intel 5500/5520/X58 chipsets
  arm64: dts: add baud rate to Juno stdout-path
  Revert "platform: x86: dell-laptop: Add support for keyboard backlight"
  Revert "Documentation: Add entry for dell-laptop sysfs interface"
  dm cache: fix problematic dual use of a single migration count variable
  dm cache: share cache-metadata object across inactive and active DM tables
  of/unittest: Overlays with sub-devices tests
  KVM: x86: SYSENTER emulation is broken
  KVM: x86: Fix of previously incomplete fix for CVE-2014-8480
  arm64: dump: Fix implicit inclusion of definition for PCI_IOBASE
  x86/tsc: Change Fast TSC calibration failed from error to info
  x86/apic: Re-enable PCI_MSI support for non-SMP X86_32
  x86, mm: Change cachemode exports to non-gpl
  x86, tls: Interpret an all-zero struct user_desc as "no segment"
  ...

Conflicts:
	drivers/media/pci/cx23885/cx23885.h

diff --cc MAINTAINERS
Simple merge

diff --cc drivers/media/pci/cx23885/cx23885-cards.c
index 2a92bcd,06931f6..f384f29
--- 1/drivers/media/pci/cx23885/cx23885-cards.c
--- 2/drivers/media/pci/cx23885/cx23885-cards.c
+++ b/drivers/media/pci/cx23885/cx23885-cards.c
@@@ -1906,8 -1877,8 +1911,9 @@@ void cx23885_card_setup(struct cx23885_
        case CX23885_BOARD_HAUPPAUGE_HVR1850:
        case CX23885_BOARD_HAUPPAUGE_HVR1290:
        case CX23885_BOARD_HAUPPAUGE_HVR4400:
+       case CX23885_BOARD_HAUPPAUGE_STARBURST:
        case CX23885_BOARD_HAUPPAUGE_IMPACTVCBE:
 +      case CX23885_BOARD_HAUPPAUGE_HVR5525:
                if (dev->i2c_bus[0].i2c_rc == 0)
                        hauppauge_eeprom(dev, eeprom+0xc0);
                break;

diff --cc drivers/media/pci/cx23885/cx23885-dvb.c
Simple merge

diff --cc drivers/media/pci/cx23885/cx23885.h
index 4f358eb,36f2f96..aeda8d3
--- 1/drivers/media/pci/cx23885/cx23885.h
--- 2/drivers/media/pci/cx23885/cx23885.h
+++ b/drivers/media/pci/cx23885/cx23885.h
@@@ -99,7 -99,7 +99,8 @@@
  #define CX23885_BOARD_DVBSKY_S950              49
  #define CX23885_BOARD_DVBSKY_S952              50
  #define CX23885_BOARD_DVBSKY_T982              51
 -#define CX23885_BOARD_HAUPPAUGE_STARBURST      52
 +#define CX23885_BOARD_HAUPPAUGE_HVR5525        52
++#define CX23885_BOARD_HAUPPAUGE_STARBURST      53
  
  #define GPIO_0 0x00000001
  #define GPIO_1 0x00000002

diff --cc drivers/media/usb/pvrusb2/pvrusb2-v4l2.c
Simple merge