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

Commit 8f71fb87 authored by Shawn Guo's avatar Shawn Guo
Browse files

Merge tag 'imx-dt-3.7' into imx/dt-for-3.7-2

parents d9875690 f8135a74

Documentation/ABI/testing/sysfs-platform-ideapad-laptop

+11 −0
Original line number Original line Diff line number Diff line
@@ -5,4 +5,15 @@ Contact: "Ike Panhc <ike.pan@canonical.com>" 
Description:

Description:

		Control the power of camera module. 1 means on, 0 means off.

		Control the power of camera module. 1 means on, 0 means off.





What:		/sys/devices/platform/ideapad/fan_mode

Date:		June 2012

KernelVersion:	3.6

Contact:	"Maxim Mikityanskiy <maxtram95@gmail.com>"

Description:

		Change fan mode

		There are four available modes:

			* 0 -> Super Silent Mode

			* 1 -> Standard Mode

			* 2 -> Dust Cleaning

			* 4 -> Efficient Thermal Dissipation Mode

Documentation/DocBook/media/v4l/vidioc-g-tuner.xml

+1 −1
Original line number Original line Diff line number Diff line
@@ -125,7 +125,7 @@ the structure refers to a radio tuner the 
<constant>V4L2_TUNER_CAP_NORM</constant> flags can't be used.</para>

<constant>V4L2_TUNER_CAP_NORM</constant> flags can't be used.</para>

<para>If multiple frequency bands are supported, then

<para>If multiple frequency bands are supported, then

<structfield>capability</structfield> is the union of all

<structfield>capability</structfield> is the union of all

<structfield>capability></structfield> fields of each &v4l2-frequency-band;.

<structfield>capability</structfield> fields of each &v4l2-frequency-band;.

</para></entry>

</para></entry>

	  </row>

	  </row>

	  <row>

	  <row>

Documentation/devicetree/bindings/regulator/tps6586x.txt

+6 −6
Original line number Original line Diff line number Diff line
@@ -9,9 +9,9 @@ Required properties: 
- regulators: list of regulators provided by this controller, must have

- regulators: list of regulators provided by this controller, must have

  property "regulator-compatible" to match their hardware counterparts:

  property "regulator-compatible" to match their hardware counterparts:

  sm[0-2], ldo[0-9] and ldo_rtc

  sm[0-2], ldo[0-9] and ldo_rtc

- sm0-supply: The input supply for the SM0.

- vin-sm0-supply: The input supply for the SM0.

- sm1-supply: The input supply for the SM1.

- vin-sm1-supply: The input supply for the SM1.

- sm2-supply: The input supply for the SM2.

- vin-sm2-supply: The input supply for the SM2.

- vinldo01-supply: The input supply for the LDO1 and LDO2

- vinldo01-supply: The input supply for the LDO1 and LDO2

- vinldo23-supply: The input supply for the LDO2 and LDO3

- vinldo23-supply: The input supply for the LDO2 and LDO3

- vinldo4-supply: The input supply for the LDO4

- vinldo4-supply: The input supply for the LDO4
@@ -30,9 +30,9 @@ Example: 
		#gpio-cells = <2>;

		#gpio-cells = <2>;

		gpio-controller;

		gpio-controller;





		sm0-supply = <&some_reg>;

		vin-sm0-supply = <&some_reg>;

		sm1-supply = <&some_reg>;

		vin-sm1-supply = <&some_reg>;

		sm2-supply = <&some_reg>;

		vin-sm2-supply = <&some_reg>;

		vinldo01-supply = <...>;

		vinldo01-supply = <...>;

		vinldo23-supply = <...>;

		vinldo23-supply = <...>;

		vinldo4-supply = <...>;

		vinldo4-supply = <...>;

Documentation/filesystems/vfat.txt

+11 −0
Original line number Original line Diff line number Diff line
@@ -137,6 +137,17 @@ errors=panic|continue|remount-ro 
		 without doing anything or remount the partition in

		 without doing anything or remount the partition in

		 read-only mode (default behavior).

		 read-only mode (default behavior).





discard       -- If set, issues discard/TRIM commands to the block

		 device when blocks are freed. This is useful for SSD devices

		 and sparse/thinly-provisoned LUNs.



nfs           -- This option maintains an index (cache) of directory

		 inodes by i_logstart which is used by the nfs-related code to

		 improve look-ups.



		 Enable this only if you want to export the FAT filesystem

		 over NFS



<bool>: 0,1,yes,no,true,false

<bool>: 0,1,yes,no,true,false





TODO

TODO

Documentation/networking/netconsole.txt

+17 −2
Original line number Original line Diff line number Diff line
@@ -51,8 +51,23 @@ Built-in netconsole starts immediately after the TCP stack is 
initialized and attempts to bring up the supplied dev at the supplied

initialized and attempts to bring up the supplied dev at the supplied

address.

address.





The remote host can run either 'netcat -u -l -p <port>',

The remote host has several options to receive the kernel messages,

'nc -l -u <port>' or syslogd.

for example:



1) syslogd



2) netcat



   On distributions using a BSD-based netcat version (e.g. Fedora,

   openSUSE and Ubuntu) the listening port must be specified without

   the -p switch:



   'nc -u -l -p <port>' / 'nc -u -l <port>' or

   'netcat -u -l -p <port>' / 'netcat -u -l <port>'



3) socat



   'socat udp-recv:<port> -'





Dynamic reconfiguration:

Dynamic reconfiguration:

========================

========================