Merge tag 'char-misc-3.19-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregk...

Pull char/misc driver updates from Greg KH:
 "Here's the big char/misc driver update for 3.19-rc1

  Lots of little things all over the place in different drivers, and a
  new subsystem, "coresight" has been added.  Full details are in the
  shortlog"

* tag 'char-misc-3.19-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc: (73 commits)
  parport: parport_pc, do not remove parent devices early
  spmi: Remove shutdown/suspend/resume kernel-doc
  carma-fpga-program: drop videobuf dependency
  carma-fpga: drop videobuf dependency
  carma-fpga-program.c: fix compile errors
  i8k: Fix temperature bug handling in i8k_get_temp()
  cxl: Name interrupts in /proc/interrupt
  CXL: Return error to PSL if IRQ demultiplexing fails & print clearer warning
  coresight-replicator: remove .owner field for driver
  coresight: fixed comments in coresight.h
  coresight: fix typo in comment in coresight-priv.h
  coresight: bindings for coresight drivers
  coresight: Adding ABI documentation
  w1: support auto-load of w1_bq27000 module.
  w1: avoid potential u16 overflow
  cn: verify msg->len before making callback
  mei: export fw status registers through sysfs
  mei: read and print all six FW status registers
  mei: txe: add cherrytrail device id
  mei: kill cached host and me csr values
  ...

diff --cc MAINTAINERS
Simple merge

diff --cc arch/arm/Kconfig.debug
Simple merge

diff --cc arch/arm/kernel/Makefile
Simple merge

diff --cc arch/arm/mach-omap2/Kconfig
index 6e249324fdd775e594582e6cb6c3380716499a92,06020fe77e57a009ec3e5e889e56eba23e357c1e..f0edec199cd4b443ac4590d274a03037341c7855
--- 1/arch/arm/mach-omap2/Kconfig
--- 2/arch/arm/mach-omap2/Kconfig
+++ b/arch/arm/mach-omap2/Kconfig
@@@ -278,14 -282,16 +278,6 @@@ config MACH_SBC353
        default y
        select OMAP_PACKAGE_CUS
  
- config OMAP3_EMU
-       bool "OMAP3 debugging peripherals"
-       depends on ARCH_OMAP3
-       select ARM_AMBA
-       select OC_ETM
-       help
-         Say Y here to enable debugging hardware of omap3
 -config MACH_TI8168EVM
 -      bool "TI8168 Evaluation Module"
 -      depends on SOC_TI81XX
 -      default y
 -
 -config MACH_TI8148EVM
 -      bool "TI8148 Evaluation Module"
 -      depends on SOC_TI81XX
 -      default y
--
  config OMAP3_SDRC_AC_TIMING
        bool "Enable SDRC AC timing register changes"
        depends on ARCH_OMAP3

diff --cc arch/arm/mach-omap2/Makefile
Simple merge

diff --cc drivers/amba/bus.c
Simple merge

diff --cc drivers/extcon/extcon-max14577.c
Simple merge

diff --cc drivers/extcon/extcon-max77693.c
Simple merge

diff --cc drivers/hv/channel_mgmt.c
Simple merge

diff --cc drivers/misc/atmel-ssc.c
Simple merge

diff --cc drivers/misc/carma/carma-fpga-program.c
Simple merge

diff --cc drivers/misc/carma/carma-fpga.c
Simple merge

diff --cc drivers/misc/mei/mei_dev.h
Simple merge

diff --cc drivers/misc/mei/pci-me.c
Simple merge

diff --cc drivers/misc/mei/pci-txe.c
Simple merge

diff --cc drivers/parport/parport_pc.c
Simple merge

diff --cc drivers/pcmcia/sa1111_generic.c
Simple merge

diff --cc include/linux/amba/bus.h
Simple merge