Commit 7d9a6ef5 authored by Andy Shevchenko's avatar Andy Shevchenko
Browse files

Merge branch 'i2c/cht-wc-fusb302-immutable' of...

Merge branch 'i2c/cht-wc-fusb302-immutable' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux

Pull i2c/cht-wc-fusb302-immutable immutable branch from Wolfram Sang:

as discussed before, here is the immutable branch for the i2c-cht-wc
driver, so you can safely apply Hans' patch [1]

"platform/x86: intel_cht_int33fe: Update fusb302 type string, add properties"

on top of this.

[1] http://patchwork.ozlabs.org/patch/824314/
parents 3fcf2b2a 0224d45c
Loading
Loading
Loading
Loading
+2 −0
Original line number Original line Diff line number Diff line
@@ -68,6 +68,8 @@ Jacob Shin <Jacob.Shin@amd.com>
James Bottomley <jejb@mulgrave.(none)>
James Bottomley <jejb@mulgrave.(none)>
James Bottomley <jejb@titanic.il.steeleye.com>
James Bottomley <jejb@titanic.il.steeleye.com>
James E Wilson <wilson@specifix.com>
James E Wilson <wilson@specifix.com>
James Hogan <jhogan@kernel.org> <james.hogan@imgtec.com>
James Hogan <jhogan@kernel.org> <james@albanarts.com>
James Ketrenos <jketreno@io.(none)>
James Ketrenos <jketreno@io.(none)>
Javi Merino <javi.merino@kernel.org> <javi.merino@arm.com>
Javi Merino <javi.merino@kernel.org> <javi.merino@arm.com>
<javier@osg.samsung.com> <javier.martinez@collabora.co.uk>
<javier@osg.samsung.com> <javier.martinez@collabora.co.uk>
+8 −0
Original line number Original line Diff line number Diff line
@@ -14,3 +14,11 @@ Description:
		Show or set the gain boost of the amp, from 0-31 range.
		Show or set the gain boost of the amp, from 0-31 range.
		18 = indoors (default)
		18 = indoors (default)
		14 = outdoors
		14 = outdoors

What		/sys/bus/iio/devices/iio:deviceX/noise_level_tripped
Date:		May 2017
KernelVersion:	4.13
Contact:	Matt Ranostay <matt.ranostay@konsulko.com>
Description:
		When 1 the noise level is over the trip level and not reporting
		valid data
+0 −10
Original line number Original line Diff line number Diff line
@@ -14,13 +14,3 @@ Description: Enable/disable VMA based swap readahead.
		still used for tmpfs etc. other users.  If set to
		still used for tmpfs etc. other users.  If set to
		false, the global swap readahead algorithm will be
		false, the global swap readahead algorithm will be
		used for all swappable pages.
		used for all swappable pages.

What:		/sys/kernel/mm/swap/vma_ra_max_order
Date:		August 2017
Contact:	Linux memory management mailing list <linux-mm@kvack.org>
Description:	The max readahead size in order for VMA based swap readahead

		VMA based swap readahead algorithm will readahead at
		most 1 << max_order pages for each readahead.  The
		real readahead size for each readahead will be scaled
		according to the estimation algorithm.
+1 −1
Original line number Original line Diff line number Diff line
@@ -127,7 +127,7 @@ Description:


What;		/sys/power/pm_trace_dev_match
What;		/sys/power/pm_trace_dev_match
Date:		October 2010
Date:		October 2010
Contact:	James Hogan <james@albanarts.com>
Contact:	James Hogan <jhogan@kernel.org>
Description:
Description:
		The /sys/power/pm_trace_dev_match file contains the name of the
		The /sys/power/pm_trace_dev_match file contains the name of the
		device associated with the last PM event point saved in the RTC
		device associated with the last PM event point saved in the RTC
+0 −14
Original line number Original line Diff line number Diff line
@@ -352,44 +352,30 @@ Read-Copy Update (RCU)
----------------------
----------------------


.. kernel-doc:: include/linux/rcupdate.h
.. kernel-doc:: include/linux/rcupdate.h
   :external:


.. kernel-doc:: include/linux/rcupdate_wait.h
.. kernel-doc:: include/linux/rcupdate_wait.h
   :external:


.. kernel-doc:: include/linux/rcutree.h
.. kernel-doc:: include/linux/rcutree.h
   :external:


.. kernel-doc:: kernel/rcu/tree.c
.. kernel-doc:: kernel/rcu/tree.c
   :external:


.. kernel-doc:: kernel/rcu/tree_plugin.h
.. kernel-doc:: kernel/rcu/tree_plugin.h
   :external:


.. kernel-doc:: kernel/rcu/tree_exp.h
.. kernel-doc:: kernel/rcu/tree_exp.h
   :external:


.. kernel-doc:: kernel/rcu/update.c
.. kernel-doc:: kernel/rcu/update.c
   :external:


.. kernel-doc:: include/linux/srcu.h
.. kernel-doc:: include/linux/srcu.h
   :external:


.. kernel-doc:: kernel/rcu/srcutree.c
.. kernel-doc:: kernel/rcu/srcutree.c
   :external:


.. kernel-doc:: include/linux/rculist_bl.h
.. kernel-doc:: include/linux/rculist_bl.h
   :external:


.. kernel-doc:: include/linux/rculist.h
.. kernel-doc:: include/linux/rculist.h
   :external:


.. kernel-doc:: include/linux/rculist_nulls.h
.. kernel-doc:: include/linux/rculist_nulls.h
   :external:


.. kernel-doc:: include/linux/rcu_sync.h
.. kernel-doc:: include/linux/rcu_sync.h
   :external:


.. kernel-doc:: kernel/rcu/sync.c
.. kernel-doc:: kernel/rcu/sync.c
   :external:
Loading