Merge branch 'x86/cpufeature' into x86/cache (7ce7f35b) · Commits · e / devices / android_kernel_fairphone_FP4

CREDITS

+3 −2

Original line number	Diff line number	Diff line
		@@ -1864,10 +1864,11 @@ S: The Netherlands

		N: Martin Kepplinger
		E: martink@posteo.de
		E: martin.kepplinger@theobroma-systems.com
		E: martin.kepplinger@ginzinger.com
		W: http://www.martinkepplinger.com
		D: mma8452 accelerators iio driver
		D: Kernel cleanups
		D: pegasus_notetaker input driver
		D: Kernel fixes and cleanups
		S: Garnisonstraße 26
		S: 4020 Linz
		S: Austria

+2 −2

Original line number	Diff line number	Diff line
		What: state
		What: /sys/devices/system/ibm_rtl/state
		Date: Sep 2010
		KernelVersion: 2.6.37
		Contact: Vernon Mauery <vernux@us.ibm.com>
		@@ -10,7 +10,7 @@ Description: The state file allows a means by which to change in and
		Users: The ibm-prtm userspace daemon uses this interface.


		What: version
		What: /sys/devices/system/ibm_rtl/version
		Date: Sep 2010
		KernelVersion: 2.6.37
		Contact: Vernon Mauery <vernux@us.ibm.com>

+1 −0

Original line number	Diff line number	Diff line
		@@ -309,3 +309,4 @@ Version History
		with a reshape in progress.
		1.9.0 Add support for RAID level takeover/reshape/region size
		and set size reduction.
		1.9.1 Fix activation of existing RAID 4/10 mapped devices

+5 −0

Original line number	Diff line number	Diff line
		@@ -43,6 +43,9 @@ Optional properties:
		reset signal present internally in some host controller IC designs.
		See Documentation/devicetree/bindings/reset/reset.txt for details.

		* reset-names: request name for using "resets" property. Must be "reset".
		(It will be used together with "resets" property.)

		* clocks: from common clock binding: handle to biu and ciu clocks for the
		bus interface unit clock and the card interface unit clock.

		@@ -103,6 +106,8 @@ board specific portions as listed below.
		interrupts = <0 75 0>;
		#address-cells = <1>;
		#size-cells = <0>;
		resets = <&rst 20>;
		reset-names = "reset";
		};

		[board specific internal DMA resources]

+1 −0

Original line number	Diff line number	Diff line
		@@ -49,6 +49,7 @@ Optional port properties:
		and

		- phy-handle: See ethernet.txt file in the same directory.
		- phy-mode: See ethernet.txt file in the same directory.

		or