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

Commit e372dc6c authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman
Browse files

Merge 3.6-rc3 into tty-next 



This picks up all of the different fixes in Linus's tree that we also need here.

Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parents 5d4121c0 fea7a08a

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

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

		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/filesystems.tmpl

+2 −2
Original line number Diff line number Diff line
@@ -224,8 +224,8 @@ all your transactions. 
</para>



<para>

Then at umount time , in your put_super() (2.4) or write_super() (2.5)

you can then call journal_destroy() to clean up your in-core journal object.

Then at umount time , in your put_super() you can then call journal_destroy()

to clean up your in-core journal object.

</para>



<para>

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

+1 −1
Original line number 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>

<para>If multiple frequency bands are supported, then

<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>

	  </row>

	  <row>

Documentation/devicetree/bindings/regulator/tps6586x.txt

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

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

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

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

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

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

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

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

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

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

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

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

		gpio-controller;



		sm0-supply = <&some_reg>;

		sm1-supply = <&some_reg>;

		sm2-supply = <&some_reg>;

		vin-sm0-supply = <&some_reg>;

		vin-sm1-supply = <&some_reg>;

		vin-sm2-supply = <&some_reg>;

		vinldo01-supply = <...>;

		vinldo23-supply = <...>;

		vinldo4-supply = <...>;

Documentation/filesystems/Locking

+0 −2
Original line number Diff line number Diff line
@@ -114,7 +114,6 @@ prototypes: 
	int (*drop_inode) (struct inode *);

	void (*evict_inode) (struct inode *);

	void (*put_super) (struct super_block *);

	void (*write_super) (struct super_block *);

	int (*sync_fs)(struct super_block *sb, int wait);

	int (*freeze_fs) (struct super_block *);

	int (*unfreeze_fs) (struct super_block *);
@@ -136,7 +135,6 @@ write_inode: 
drop_inode:				!!!inode->i_lock!!!

evict_inode:

put_super:		write

write_super:		read

sync_fs:		read

freeze_fs:		write

unfreeze_fs:		write