Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net (d4185bbf) · Commits · e / devices / android_kernel_fairphone_FP3

.gitignore

+0 −6

Original line number	Original line	Diff line number	Diff line
	@@ -14,10 +14,6 @@
	.o.		.o.
	*.a		*.a
	*.s		*.s
	*.ko.unsigned
	*.ko.stripped
	*.ko.stripped.dig
	*.ko.stripped.sig
	*.ko		*.ko
	*.so		*.so
	*.so.dbg		*.so.dbg
	@@ -95,6 +91,4 @@ GTAGS
	extra_certificates		extra_certificates
	signing_key.priv		signing_key.priv
	signing_key.x509		signing_key.x509
	signing_key.x509.keyid
	signing_key.x509.signer
	x509.genkey		x509.genkey

Documentation/00-INDEX

+2 −2

Original line number	Original line	Diff line number	Diff line
	@@ -210,6 +210,8 @@ local_ops.txt
	- semantics and behavior of local atomic operations.		- semantics and behavior of local atomic operations.
	lockdep-design.txt		lockdep-design.txt
	- documentation on the runtime locking correctness validator.		- documentation on the runtime locking correctness validator.
			lockup-watchdogs.txt
			- info on soft and hard lockup detectors (aka nmi_watchdog).
	logo.gif		logo.gif
	- full colour GIF image of Linux logo (penguin - Tux).		- full colour GIF image of Linux logo (penguin - Tux).
	logo.txt		logo.txt
	@@ -240,8 +242,6 @@ netlabel/
	- directory with information on the NetLabel subsystem.		- directory with information on the NetLabel subsystem.
	networking/		networking/
	- directory with info on various aspects of networking with Linux.		- directory with info on various aspects of networking with Linux.
	nmi_watchdog.txt
	- info on NMI watchdog for SMP systems.
	nommu-mmap.txt		nommu-mmap.txt
	- documentation about no-mmu memory mapping support.		- documentation about no-mmu memory mapping support.
	numastat.txt		numastat.txt

Documentation/DocBook/media/Makefile

+38 −38

Documentation/devicetree/bindings/arm/atmel-at91.txt

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -8,7 +8,7 @@ PIT Timer required properties:
	shared across all System Controller members.		shared across all System Controller members.

	TC/TCLIB Timer required properties:		TC/TCLIB Timer required properties:
	- compatible: Should be "atmel,<chip>-pit".		- compatible: Should be "atmel,<chip>-tcb".
	<chip> can be "at91rm9200" or "at91sam9x5"		<chip> can be "at91rm9200" or "at91sam9x5"
	- reg: Should contain registers location and length		- reg: Should contain registers location and length
	- interrupts: Should contain all interrupts for the TC block		- interrupts: Should contain all interrupts for the TC block

Documentation/devicetree/bindings/input/touchscreen/egalax-ts.txt

0 → 100644

+19 −0

Original line number	Original line	Diff line number	Diff line
			* EETI eGalax Multiple Touch Controller

			Required properties:
			- compatible: must be "eeti,egalax_ts"
			- reg: i2c slave address
			- interrupt-parent: the phandle for the interrupt controller
			- interrupts: touch controller interrupt
			- wakeup-gpios: the gpio pin to be used for waking up the controller
			as well as uased as irq pin

			Example:

			egalax_ts@04 {
			compatible = "eeti,egalax_ts";
			reg = <0x04>;
			interrupt-parent = <&gpio1>;
			interrupts = <9 2>;
			wakeup-gpios = <&gpio1 9 0>;
			};

Original line number	Original line	Diff line number	Diff line
	@@ -56,15 +56,15 @@ FUNCS = \
	write \		write \

	IOCTLS = \		IOCTLS = \
	$(shell perl -ne 'print "$$1 " if /\#define\s+([^\s]+)\s+_IO/' $(srctree)/include/linux/videodev2.h) \		$(shell perl -ne 'print "$$1 " if /\#define\s+([^\s]+)\s+_IO/' $(srctree)/include/uapi/linux/videodev2.h) \
	$(shell perl -ne 'print "$$1 " if /\#define\s+([^\s]+)\s+_IO/' $(srctree)/include/linux/dvb/audio.h) \		$(shell perl -ne 'print "$$1 " if /\#define\s+([^\s]+)\s+_IO/' $(srctree)/include/uapi/linux/dvb/audio.h) \
	$(shell perl -ne 'print "$$1 " if /\#define\s+([^\s]+)\s+_IO/' $(srctree)/include/linux/dvb/ca.h) \		$(shell perl -ne 'print "$$1 " if /\#define\s+([^\s]+)\s+_IO/' $(srctree)/include/uapi/linux/dvb/ca.h) \
	$(shell perl -ne 'print "$$1 " if /\#define\s+([^\s]+)\s+_IO/' $(srctree)/include/linux/dvb/dmx.h) \		$(shell perl -ne 'print "$$1 " if /\#define\s+([^\s]+)\s+_IO/' $(srctree)/include/uapi/linux/dvb/dmx.h) \
	$(shell perl -ne 'print "$$1 " if /\#define\s+([^\s]+)\s+_IO/' $(srctree)/include/linux/dvb/frontend.h) \		$(shell perl -ne 'print "$$1 " if /\#define\s+([^\s]+)\s+_IO/' $(srctree)/include/uapi/linux/dvb/frontend.h) \
	$(shell perl -ne 'print "$$1 " if /\#define\s+([A-Z][^\s]+)\s+_IO/' $(srctree)/include/linux/dvb/net.h) \		$(shell perl -ne 'print "$$1 " if /\#define\s+([A-Z][^\s]+)\s+_IO/' $(srctree)/include/uapi/linux/dvb/net.h) \
	$(shell perl -ne 'print "$$1 " if /\#define\s+([^\s]+)\s+_IO/' $(srctree)/include/linux/dvb/video.h) \		$(shell perl -ne 'print "$$1 " if /\#define\s+([^\s]+)\s+_IO/' $(srctree)/include/uapi/linux/dvb/video.h) \
	$(shell perl -ne 'print "$$1 " if /\#define\s+([^\s]+)\s+_IO/' $(srctree)/include/linux/media.h) \		$(shell perl -ne 'print "$$1 " if /\#define\s+([^\s]+)\s+_IO/' $(srctree)/include/uapi/linux/media.h) \
	$(shell perl -ne 'print "$$1 " if /\#define\s+([^\s]+)\s+_IO/' $(srctree)/include/linux/v4l2-subdev.h) \		$(shell perl -ne 'print "$$1 " if /\#define\s+([^\s]+)\s+_IO/' $(srctree)/include/uapi/linux/v4l2-subdev.h) \
	VIDIOC_SUBDEV_G_FRAME_INTERVAL \		VIDIOC_SUBDEV_G_FRAME_INTERVAL \
	VIDIOC_SUBDEV_S_FRAME_INTERVAL \		VIDIOC_SUBDEV_S_FRAME_INTERVAL \
	VIDIOC_SUBDEV_ENUM_MBUS_CODE \		VIDIOC_SUBDEV_ENUM_MBUS_CODE \
	@@ -74,32 +74,32 @@ IOCTLS = \
	VIDIOC_SUBDEV_S_SELECTION \		VIDIOC_SUBDEV_S_SELECTION \

	TYPES = \		TYPES = \
	$(shell perl -ne 'print "$$1 " if /^typedef\s+[^\s]+\s+([^\s]+)\;/' $(srctree)/include/linux/videodev2.h) \		$(shell perl -ne 'print "$$1 " if /^typedef\s+[^\s]+\s+([^\s]+)\;/' $(srctree)/include/uapi/linux/videodev2.h) \
	$(shell perl -ne 'print "$$1 " if /^}\s+([a-z0-9_]+_t)/' $(srctree)/include/linux/dvb/frontend.h)		$(shell perl -ne 'print "$$1 " if /^}\s+([a-z0-9_]+_t)/' $(srctree)/include/uapi/linux/dvb/frontend.h)

	ENUMS = \		ENUMS = \
	$(shell perl -ne 'print "$$1 " if /^enum\s+([^\s]+)\s+/' $(srctree)/include/linux/videodev2.h) \		$(shell perl -ne 'print "$$1 " if /^enum\s+([^\s]+)\s+/' $(srctree)/include/uapi/linux/videodev2.h) \
	$(shell perl -ne 'print "$$1 " if /^enum\s+([^\s]+)\s+/' $(srctree)/include/linux/dvb/audio.h) \		$(shell perl -ne 'print "$$1 " if /^enum\s+([^\s]+)\s+/' $(srctree)/include/uapi/linux/dvb/audio.h) \
	$(shell perl -ne 'print "$$1 " if /^enum\s+([^\s]+)\s+/' $(srctree)/include/linux/dvb/ca.h) \		$(shell perl -ne 'print "$$1 " if /^enum\s+([^\s]+)\s+/' $(srctree)/include/uapi/linux/dvb/ca.h) \
	$(shell perl -ne 'print "$$1 " if /^enum\s+([^\s]+)\s+/' $(srctree)/include/linux/dvb/dmx.h) \		$(shell perl -ne 'print "$$1 " if /^enum\s+([^\s]+)\s+/' $(srctree)/include/uapi/linux/dvb/dmx.h) \
	$(shell perl -ne 'print "$$1 " if /^enum\s+([^\s]+)\s+/' $(srctree)/include/linux/dvb/frontend.h) \		$(shell perl -ne 'print "$$1 " if /^enum\s+([^\s]+)\s+/' $(srctree)/include/uapi/linux/dvb/frontend.h) \
	$(shell perl -ne 'print "$$1 " if /^enum\s+([^\s]+)\s+/' $(srctree)/include/linux/dvb/net.h) \		$(shell perl -ne 'print "$$1 " if /^enum\s+([^\s]+)\s+/' $(srctree)/include/uapi/linux/dvb/net.h) \
	$(shell perl -ne 'print "$$1 " if /^enum\s+([^\s]+)\s+/' $(srctree)/include/linux/dvb/video.h) \		$(shell perl -ne 'print "$$1 " if /^enum\s+([^\s]+)\s+/' $(srctree)/include/uapi/linux/dvb/video.h) \
	$(shell perl -ne 'print "$$1 " if /^enum\s+([^\s]+)\s+/' $(srctree)/include/linux/media.h) \		$(shell perl -ne 'print "$$1 " if /^enum\s+([^\s]+)\s+/' $(srctree)/include/uapi/linux/media.h) \
	$(shell perl -ne 'print "$$1 " if /^enum\s+([^\s]+)\s+/' $(srctree)/include/linux/v4l2-mediabus.h) \		$(shell perl -ne 'print "$$1 " if /^enum\s+([^\s]+)\s+/' $(srctree)/include/uapi/linux/v4l2-mediabus.h) \
	$(shell perl -ne 'print "$$1 " if /^enum\s+([^\s]+)\s+/' $(srctree)/include/linux/v4l2-subdev.h)		$(shell perl -ne 'print "$$1 " if /^enum\s+([^\s]+)\s+/' $(srctree)/include/uapi/linux/v4l2-subdev.h)

	STRUCTS = \		STRUCTS = \
	$(shell perl -ne 'print "$$1 " if /^struct\s+([^\s]+)\s+/' $(srctree)/include/linux/videodev2.h) \		$(shell perl -ne 'print "$$1 " if /^struct\s+([^\s]+)\s+/' $(srctree)/include/uapi/linux/videodev2.h) \
	$(shell perl -ne 'print "$$1 " if (/^struct\s+([^\s\{]+)\s*/)' $(srctree)/include/linux/dvb/audio.h) \		$(shell perl -ne 'print "$$1 " if (/^struct\s+([^\s\{]+)\s*/)' $(srctree)/include/uapi/linux/dvb/audio.h) \
	$(shell perl -ne 'print "$$1 " if (/^struct\s+([^\s]+)\s+/)' $(srctree)/include/linux/dvb/ca.h) \		$(shell perl -ne 'print "$$1 " if (/^struct\s+([^\s]+)\s+/)' $(srctree)/include/uapi/linux/dvb/ca.h) \
	$(shell perl -ne 'print "$$1 " if (/^struct\s+([^\s]+)\s+/)' $(srctree)/include/linux/dvb/dmx.h) \		$(shell perl -ne 'print "$$1 " if (/^struct\s+([^\s]+)\s+/)' $(srctree)/include/uapi/linux/dvb/dmx.h) \