Commit 53f724b2 authored by Jiri Kosina's avatar Jiri Kosina
Browse files

Merge branches 'for-4.10/upstream-fixes', 'for-4.11/intel-ish',... 

Merge branches 'for-4.10/upstream-fixes', 'for-4.11/intel-ish', 'for-4.11/mayflash', 'for-4.11/microsoft', 'for-4.11/rmi', 'for-4.11/upstream' and 'for-4.11/wacom' into for-linus
parents f3287a99 12be9f7b fe6cc17f d193c169 c7821d0f 7021b600 a48324de

.mailmap

+4 −0
Original line number Diff line number Diff line
@@ -137,6 +137,7 @@ Ricardo Ribalda Delgado <ricardo.ribalda@gmail.com> 
Rudolf Marek <R.Marek@sh.cvut.cz>

Rui Saraiva <rmps@joel.ist.utl.pt>

Sachin P Sant <ssant@in.ibm.com>

Sarangdhar Joshi <spjoshi@codeaurora.org>

Sam Ravnborg <sam@mars.ravnborg.org>

Santosh Shilimkar <ssantosh@kernel.org>

Santosh Shilimkar <santosh.shilimkar@oracle.org>
@@ -150,10 +151,13 @@ Shuah Khan <shuah@kernel.org> <shuah.kh@samsung.com> 
Simon Kelley <simon@thekelleys.org.uk>

Stéphane Witzmann <stephane.witzmann@ubpmes.univ-bpclermont.fr>

Stephen Hemminger <shemminger@osdl.org>

Subash Abhinov Kasiviswanathan <subashab@codeaurora.org>

Subhash Jadavani <subhashj@codeaurora.org>

Sudeep Holla <sudeep.holla@arm.com> Sudeep KarkadaNagesha <sudeep.karkadanagesha@arm.com>

Sumit Semwal <sumit.semwal@ti.com>

Tejun Heo <htejun@gmail.com>

Thomas Graf <tgraf@suug.ch>

Thomas Pedersen <twp@codeaurora.org>

Tony Luck <tony.luck@intel.com>

Tsuneo Yoshioka <Tsuneo.Yoshioka@f-secure.com>

Uwe Kleine-König <ukleinek@informatik.uni-freiburg.de>

CREDITS

+0 −2
Original line number Diff line number Diff line
@@ -3949,8 +3949,6 @@ E: gwingerde@gmail.com 
D: Ralink rt2x00 WLAN driver

D: Minix V2 file-system

D: Misc fixes

S: Geessinkweg 177

S: 7544 TX Enschede

S: The Netherlands



N: Lars Wirzenius

Documentation/00-INDEX

+0 −2
Original line number Diff line number Diff line
@@ -152,8 +152,6 @@ driver-model/ 
	- directory with info about Linux driver model.

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

Documentation/ABI/testing/sysfs-bus-pci

+7 −0
Original line number Diff line number Diff line
@@ -294,3 +294,10 @@ Description: 
		a firmware bug to the system vendor.  Writing to this file

		taints the kernel with TAINT_FIRMWARE_WORKAROUND, which

		reduces the supportability of your system.



What:		/sys/bus/pci/devices/.../revision

Date:		November 2016

Contact:	Emil Velikov <emil.l.velikov@gmail.com>

Description:

		This file contains the revision field of the the PCI device.

		The value comes from device config space. The file is read only.

Documentation/ABI/testing/sysfs-class-rtc-rtc0-device-rtc_calibration

+3 −2
Original line number Diff line number Diff line 
What:           Attribute for calibrating ST-Ericsson AB8500 Real Time Clock

What:           /sys/class/rtc/rtc0/device/rtc_calibration

Date:           Oct 2011

KernelVersion:  3.0

Contact:        Mark Godfrey <mark.godfrey@stericsson.com>

Description:    The rtc_calibration attribute allows the userspace to

Description:    Attribute for calibrating ST-Ericsson AB8500 Real Time Clock

		The rtc_calibration attribute allows the userspace to

                calibrate the AB8500.s 32KHz Real Time Clock.

                Every 60 seconds the AB8500 will correct the RTC's value

                by adding to it the value of this attribute.