From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Tue, 5 Aug 2014 00:32:24 +0000 (-0700)
Subject: Merge tag 'char-misc-3.17-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregk... 
X-Git-Tag: v3.17-rc1~125
X-Git-Url: http://git.cascardo.info/?p=cascardo%2Flinux.git;a=commitdiff_plain;h=2521129a6d2fd8a81f99cf95055eddea3df914ff

Merge tag 'char-misc-3.17-rc1' of git://git./linux/kernel/git/gregkh/char-misc

Pull char / misc driver patches from Greg KH:
 "Here's the big driver misc / char pull request for 3.17-rc1.

  Lots of things in here, the thunderbolt support for Apple laptops,
  some other new drivers, testing fixes, and other good things.  All
  have been in linux-next for a long time"

* tag 'char-misc-3.17-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc: (119 commits)
  misc: bh1780: Introduce the use of devm_kzalloc
  Lattice ECP3 FPGA: Correct endianness
  drivers/misc/ti-st: Load firmware from ti-connectivity directory.
  dt-bindings: extcon: Add support for SM5502 MUIC device
  extcon: sm5502: Change internal hardware switch according to cable type
  extcon: sm5502: Detect cable state after completing platform booting
  extcon: sm5502: Add support new SM5502 extcon device driver
  extcon: arizona: Get MICVDD against extcon device
  extcon: Remove unnecessary OOM messages
  misc: vexpress: Fix sparse non static symbol warnings
  mei: drop unused hw dependent fw status functions
  misc: bh1770glc: Use managed functions
  pcmcia: remove DEFINE_PCI_DEVICE_TABLE usage
  misc: remove DEFINE_PCI_DEVICE_TABLE usage
  ipack: Replace DEFINE_PCI_DEVICE_TABLE macro use
  drivers/char/dsp56k.c: drop check for negativity of unsigned parameter
  mei: fix return value on disconnect timeout
  mei: don't schedule suspend in pm idle
  mei: start disconnect request timer consistently
  mei: reset client connection state on timeout
  ...
---

2521129a6d2fd8a81f99cf95055eddea3df914ff
diff --cc drivers/Kconfig
index 4e6e66c3c8d6,9b2dcc2ea663..622fa266b29e
--- a/drivers/Kconfig
+++ b/drivers/Kconfig
@@@ -176,6 -176,6 +176,8 @@@ source "drivers/powercap/Kconfig
  
  source "drivers/mcb/Kconfig"
  
 +source "drivers/ras/Kconfig"
 +
+ source "drivers/thunderbolt/Kconfig"
+ 
  endmenu
diff --cc drivers/Makefile
index 65c32b1cea3d,37b9ed4cd2d6..54bfae1f09a4
--- a/drivers/Makefile
+++ b/drivers/Makefile
@@@ -158,4 -158,4 +158,5 @@@ obj-$(CONFIG_NTB)		+= ntb
  obj-$(CONFIG_FMC)		+= fmc/
  obj-$(CONFIG_POWERCAP)		+= powercap/
  obj-$(CONFIG_MCB)		+= mcb/
 +obj-$(CONFIG_RAS)		+= ras/
+ obj-$(CONFIG_THUNDERBOLT)	+= thunderbolt/