Merge tag 'v3.14-rc4' into next (04421fe2) · Commits · e / devices / android_kernel_fairphone_FP3

.gitignore

+3 −0

Original line number	Diff line number	Diff line
		@@ -92,3 +92,6 @@ extra_certificates
		signing_key.priv
		signing_key.x509
		x509.genkey

		# Kconfig presets
		all.config

CREDITS

+2 −2

Original line number	Diff line number	Diff line
		@@ -823,8 +823,8 @@ S: D-69231 Rauenberg
		S: Germany

		N: Jean Delvare
		E: khali@linux-fr.org
		W: http://khali.linux-fr.org/
		E: jdelvare@suse.de
		W: http://jdelvare.nerim.net/
		D: Several hardware monitoring drivers
		S: France

Documentation/00-INDEX

+20 −4

Original line number	Diff line number	Diff line
		@@ -29,6 +29,8 @@ DMA-ISA-LPC.txt
		- How to do DMA with ISA (and LPC) devices.
		DMA-attributes.txt
		- listing of the various possible attributes a DMA region can have
		dmatest.txt
		- how to compile, configure and use the dmatest system.
		DocBook/
		- directory with DocBook templates etc. for kernel documentation.
		EDID/
		@@ -77,6 +79,8 @@ arm/
		- directory with info about Linux on the ARM architecture.
		arm64/
		- directory with info about Linux on the 64 bit ARM architecture.
		assoc_array.txt
		- generic associative array intro.
		atomic_ops.txt
		- semantics and behavior of atomic and bitmask operations.
		auxdisplay/
		@@ -87,6 +91,8 @@ bad_memory.txt
		- how to use kernel parameters to exclude bad RAM regions.
		basic_profiling.txt
		- basic instructions for those who wants to profile Linux kernel.
		bcache.txt
		- Block-layer cache on fast SSDs to improve slow (raid) I/O performance.
		binfmt_misc.txt
		- info on the kernel support for extra binary formats.
		blackfin/
		@@ -171,6 +177,8 @@ early-userspace/
		- info about initramfs, klibc, and userspace early during boot.
		edac.txt
		- information on EDAC - Error Detection And Correction
		efi-stub.txt
		- How to use the EFI boot stub to bypass GRUB or elilo on EFI systems.
		eisa.txt
		- info on EISA bus support.
		email-clients.txt
		@@ -195,8 +203,8 @@ futex-requeue-pi.txt
		- info on requeueing of tasks from a non-PI futex to a PI futex
		gcov.txt
		- use of GCC's coverage testing tool "gcov" with the Linux kernel
		gpio.txt
		- overview of GPIO (General Purpose Input/Output) access conventions.
		gpio/
		- gpio related documentation
		hid/
		- directory with information on human interface devices
		highuid.txt
		@@ -255,6 +263,8 @@ kernel-docs.txt
		- listing of various WWW + books that document kernel internals.
		kernel-parameters.txt
		- summary listing of command line / boot prompt args for the kernel.
		kernel-per-CPU-kthreads.txt
		- List of all per-CPU kthreads and how they introduce jitter.
		kmemcheck.txt
		- info on dynamic checker that detects uses of uninitialized memory.
		kmemleak.txt
		@@ -299,8 +309,6 @@ memory-devices/
		- directory with info on parts like the Texas Instruments EMIF driver
		memory-hotplug.txt
		- Hotpluggable memory support, how to use and current status.
		memory.txt
		- info on typical Linux memory problems.
		metag/
		- directory with info about Linux on Meta architecture.
		mips/
		@@ -311,6 +319,8 @@ mmc/
		- directory with info about the MMC subsystem
		mn10300/
		- directory with info about the mn10300 architecture port
		module-signing.txt
		- Kernel module signing for increased security when loading modules.
		mtd/
		- directory with info about memory technology devices (flash)
		mono.txt
		@@ -343,6 +353,8 @@ pcmcia/
		- info on the Linux PCMCIA driver.
		percpu-rw-semaphore.txt
		- RCU based read-write semaphore optimized for locking for reading
		phy.txt
		- Description of the generic PHY framework.
		pi-futex.txt
		- documentation on lightweight priority inheritance futexes.
		pinctrl.txt
		@@ -431,6 +443,8 @@ sysrq.txt
		- info on the magic SysRq key.
		target/
		- directory with info on generating TCM v4 fabric .ko modules
		this_cpu_ops.txt
		- List rationale behind and the way to use this_cpu operations.
		thermal/
		- directory with information on managing thermal issues (CPU/temp)
		trace/
		@@ -469,6 +483,8 @@ wimax/
		- directory with info about Intel Wireless Wimax Connections
		workqueue.txt
		- information on the Concurrency Managed Workqueue implementation
		ww-mutex-design.txt
		- Intro to Mutex wait/would deadlock handling.s
		x86/x86_64/
		- directory with info on Linux support for AMD x86-64 (Hammer) machines.
		xtensa/

Documentation/ABI/testing/configfs-usb-gadget

+6 −6

Original line number	Diff line number	Diff line
		What: /config/usb-gadget
		Date: Jun 2013
		KenelVersion: 3.11
		KernelVersion: 3.11
		Description:
		This group contains sub-groups corresponding to created
		USB gadgets.

		What: /config/usb-gadget/gadget
		Date: Jun 2013
		KenelVersion: 3.11
		KernelVersion: 3.11
		Description:

		The attributes of a gadget:
		@@ -27,7 +27,7 @@ Description:

		What: /config/usb-gadget/gadget/configs
		Date: Jun 2013
		KenelVersion: 3.11
		KernelVersion: 3.11
		Description:
		This group contains a USB gadget's configurations

		@@ -58,20 +58,20 @@ Description:

		What: /config/usb-gadget/gadget/functions
		Date: Jun 2013
		KenelVersion: 3.11
		KernelVersion: 3.11
		Description:
		This group contains functions available to this USB gadget.

		What: /config/usb-gadget/gadget/strings
		Date: Jun 2013
		KenelVersion: 3.11
		KernelVersion: 3.11
		Description:
		This group contains subdirectories for language-specific
		strings for this gadget.

		What: /config/usb-gadget/gadget/strings/language
		Date: Jun 2013
		KenelVersion: 3.11
		KernelVersion: 3.11
		Description:
		The attributes:

Documentation/ABI/testing/configfs-usb-gadget-acm

+1 −1

Original line number	Diff line number	Diff line
		What: /config/usb-gadget/gadget/functions/acm.name
		Date: Jun 2013
		KenelVersion: 3.11
		KernelVersion: 3.11
		Description:

		This item contains just one readonly attribute: port_num.