---

yaml
---
r: 336798
b: refs/heads/master
c: b7e3830
h: refs/heads/master
v: v3

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 583bdc59820692eead7868e816d08bee4c55c1c6
+refs/heads/master: b7e383046c2c7c13ad928cd7407eafff758ddd4b

trunk/CREDITS

@@ -1823,11 +1823,6 @@ S: Kattreinstr 38
 S: D-64295
 S: Germany
 
-N: Avi Kivity
-E: avi.kivity@gmail.com
-D: Kernel-based Virtual Machine (KVM)
-S: Ra'annana, Israel
-
 N: Andi Kleen
 E: andi@firstfloor.org
 U: http://www.halobates.de

trunk/Documentation/ABI/testing/sysfs-class-devfreq

@@ -11,24 +11,23 @@ What:		/sys/class/devfreq/.../governor
 Date:		September 2011
 Contact:	MyungJoo Ham <myungjoo.ham@samsung.com>
 Description:
-		The /sys/class/devfreq/.../governor show or set the name of the
+		The /sys/class/devfreq/.../governor shows the name of the
 		governor used by the corresponding devfreq object.
 
 What:		/sys/class/devfreq/.../cur_freq
 Date:		September 2011
 Contact:	MyungJoo Ham <myungjoo.ham@samsung.com>
 Description:
 		The /sys/class/devfreq/.../cur_freq shows the current
-		frequency of the corresponding devfreq object. Same as
-		target_freq when get_cur_freq() is not implemented by
-		devfreq driver.
+		frequency of the corresponding devfreq object.
 
-What:		/sys/class/devfreq/.../target_freq
-Date:		September 2012
-Contact:	Rajagopal Venkat <rajagopal.venkat@linaro.org>
+What:		/sys/class/devfreq/.../central_polling
+Date:		September 2011
+Contact:	MyungJoo Ham <myungjoo.ham@samsung.com>
 Description:
-		The /sys/class/devfreq/.../target_freq shows the next governor
-		predicted target frequency of the corresponding devfreq object.
+		The /sys/class/devfreq/.../central_polling shows whether
+		the devfreq ojbect is using devfreq-provided central
+		polling mechanism or not.
 
 What:		/sys/class/devfreq/.../polling_interval
 Date:		September 2011
@@ -44,37 +43,10 @@ Description:
 		(/sys/class/devfreq/.../central_polling is 0), this value
 		may be useless.
 
-What:		/sys/class/devfreq/.../trans_stat
-Date:		October 2012
-Contact:	MyungJoo Ham <myungjoo.ham@samsung.com>
-Descrtiption:
-		This ABI shows the statistics of devfreq behavior on a
-		specific device. It shows the time spent in each state and
-		the number of transitions between states.
-		In order to activate this ABI, the devfreq target device
-		driver should provide the list of available frequencies
-		with its profile.
-
 What:		/sys/class/devfreq/.../userspace/set_freq
 Date:		September 2011
 Contact:	MyungJoo Ham <myungjoo.ham@samsung.com>
 Description:
 		The /sys/class/devfreq/.../userspace/set_freq shows and
 		sets the requested frequency for the devfreq object if
 		userspace governor is in effect.
-
-What:		/sys/class/devfreq/.../available_frequencies
-Date:		October 2012
-Contact:	Nishanth Menon <nm@ti.com>
-Description:
-		The /sys/class/devfreq/.../available_frequencies shows
-		the available frequencies of the corresponding devfreq object.
-		This is a snapshot of available frequencies and not limited
-		by the min/max frequency restrictions.
-
-What:		/sys/class/devfreq/.../available_governors
-Date:		October 2012
-Contact:	Nishanth Menon <nm@ti.com>
-Description:
-		The /sys/class/devfreq/.../available_governors shows
-		currently available governors in the system.

trunk/Documentation/ABI/testing/sysfs-devices-power

@@ -204,34 +204,3 @@ Description:
 
 		This attribute has no effect on system-wide suspend/resume and
 		hibernation.
-
-What:		/sys/devices/.../power/pm_qos_no_power_off
-Date:		September 2012
-Contact:	Rafael J. Wysocki <rjw@sisk.pl>
-Description:
-		The /sys/devices/.../power/pm_qos_no_power_off attribute
-		is used for manipulating the PM QoS "no power off" flag.  If
-		set, this flag indicates to the kernel that power should not
-		be removed entirely from the device.
-
-		Not all drivers support this attribute.  If it isn't supported,
-		it is not present.
-
-		This attribute has no effect on system-wide suspend/resume and
-		hibernation.
-
-What:		/sys/devices/.../power/pm_qos_remote_wakeup
-Date:		September 2012
-Contact:	Rafael J. Wysocki <rjw@sisk.pl>
-Description:
-		The /sys/devices/.../power/pm_qos_remote_wakeup attribute
-		is used for manipulating the PM QoS "remote wakeup required"
-		flag.  If set, this flag indicates to the kernel that the
-		device is a source of user events that have to be signaled from
-		its low-power states.
-
-		Not all drivers support this attribute.  If it isn't supported,
-		it is not present.
-
-		This attribute has no effect on system-wide suspend/resume and
-		hibernation.

trunk/Documentation/cgroups/memory.txt

@@ -466,10 +466,6 @@ Note:
 5.3 swappiness
 
 Similar to /proc/sys/vm/swappiness, but affecting a hierarchy of groups only.
-Please note that unlike the global swappiness, memcg knob set to 0
-really prevents from any swapping even if there is a swap storage
-available. This might lead to memcg OOM killer if there are no file
-pages to reclaim.
 
 Following cgroups' swappiness can't be changed.
 - root cgroup (uses /proc/sys/vm/swappiness).