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

Commit c29b8f31 authored by Mauro Carvalho Chehab's avatar Mauro Carvalho Chehab
Browse files

Merge tag 'v3.14-rc1' into patchwork 

Linus 3.14-rc1

* tag 'v3.14-rc1': (11781 commits)
  Linus 3.14-rc1
  hpfs: optimize quad buffer loading
  hpfs: remember free space
  parisc: add flexible mmap memory layout support
  parisc: Make EWOULDBLOCK be equal to EAGAIN on parisc
  parisc: convert uapi/asm/stat.h to use native types only
  parisc: wire up sched_setattr and sched_getattr
  parisc: fix cache-flushing
  parisc/sti_console: prefer Linux fonts over built-in ROM fonts
  hwmon: Fix SENSORS_TMP102 dependencies to eliminate build errors
  hwmon: Fix SENSORS_LM75 dependencies to eliminate build errors
  tools/power turbostat: introduce -s to dump counters
  tools/power turbostat: remove unused command line option
  afs: proc cells and rootcell are writeable
  tile: remove compat_sys_lookup_dcookie declaration to fix compile error
  Revert "PCI: Remove from bus_list and release resources in pci_release_dev()"
  ARM: multi_v7_defconfig: remove redundant entries and re-enable TI_EDMA
  ARM: multi_v7_defconfig: add mvebu drivers
  clocksource: kona: Add basic use of external clock
  drivers: bus: fix CCI driver kcalloc call parameters swap
  ...
parents 587d1b06 38dbfb59

CREDITS

+7 −2
Original line number Diff line number Diff line
@@ -655,6 +655,11 @@ S: Stanford University 
S: Stanford, California 94305

S: USA



N: Carlos Chinea

E: carlos.chinea@nokia.com

E: cch.devel@gmail.com

D: Author of HSI Subsystem



N: Randolph Chung

E: tausq@debian.org

D: Linux/PA-RISC hacker
@@ -818,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/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.

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

+1 −1
Original line number Diff line number Diff line 
What:		/config/usb-gadget/gadget/functions/ecm.name

Date:		Jun 2013

KenelVersion:	3.11

KernelVersion:	3.11

Description:

		The attributes:

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

+1 −1
Original line number Diff line number Diff line 
What:		/config/usb-gadget/gadget/functions/eem.name

Date:		Jun 2013

KenelVersion:	3.11

KernelVersion:	3.11

Description:

		The attributes: