Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 407f3fd8 authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman
Browse files

Merge 3.2-rc5 into staging-next 



This resolves the conflict in the
drivers/staging/iio/industrialio-core.c file due to two different
changes made to resolve the same problem.

Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parents dc47ce90 1d06825b

Documentation/devicetree/bindings/nvec/nvec_nvidia.txt

0 → 100644
+9 −0
Original line number Diff line number Diff line 
NVIDIA compliant embedded controller



Required properties:

- compatible : should be "nvidia,nvec".

- reg : the iomem of the i2c slave controller

- interrupts : the interrupt line of the i2c slave controller

- clock-frequency : the frequency of the i2c bus

- gpios : the gpio used for ec request

- slave-addr: the i2c address of the slave controller

MAINTAINERS

+7 −0
Original line number Diff line number Diff line
@@ -4152,6 +4152,13 @@ W: http://ltp.sourceforge.net/ 
T:	git git://ltp.git.sourceforge.net/gitroot/ltp/ltp-dev

S:	Maintained



LTTng (Linux Trace Toolkit Next Generation)

M:	Mathieu Desnoyers <mathieu.desnoyers@efficios.com>

L:	lttng-dev@lists.lttng.org (moderated for non-subscribers)

W:	http://lttng.org

S:	Maintained

F:	drivers/staging/lttng/



M32R ARCHITECTURE

M:	Hirokazu Takata <takata@linux-m32r.org>

L:	linux-m32r@ml.linux-m32r.org (moderated for non-subscribers)

drivers/net/Kconfig

+2 −0
Original line number Diff line number Diff line
@@ -338,4 +338,6 @@ config VMXNET3 
	  To compile this driver as a module, choose M here: the

	  module will be called vmxnet3.



source "drivers/net/hyperv/Kconfig"



endif # NETDEVICES

drivers/net/Makefile

+2 −0
Original line number Diff line number Diff line
@@ -66,3 +66,5 @@ obj-$(CONFIG_USB_USBNET) += usb/ 
obj-$(CONFIG_USB_ZD1201)        += usb/

obj-$(CONFIG_USB_IPHETH)        += usb/

obj-$(CONFIG_USB_CDC_PHONET)   += usb/



obj-$(CONFIG_HYPERV_NET) += hyperv/

drivers/net/hyperv/Kconfig

0 → 100644
+5 −0
Original line number Diff line number Diff line 
config HYPERV_NET

	tristate "Microsoft Hyper-V virtual network driver"

	depends on HYPERV

	help

	  Select this option to enable the Hyper-V virtual network driver.