Merge git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git (c1f3ee12) · Commits · e / devices / android_kernel_xiaomi_markw

.gitignore

+1 −0

+16 −0

Original line number	Diff line number	Diff line
		@@ -1353,6 +1353,14 @@ S: Gen Stedmanstraat 212
		S: 5623 HZ Eindhoven
		S: The Netherlands

		N: Oliver Hartkopp
		E: oliver.hartkopp@volkswagen.de
		W: http://www.volkswagen.de
		D: Controller Area Network (network layer core)
		S: Brieffach 1776
		S: 38436 Wolfsburg
		S: Germany

		N: Andrew Haylett
		E: ajh@primag.co.uk
		D: Selection mechanism
		@@ -3306,6 +3314,14 @@ S: Universit=E9 de Rennes I
		S: F-35042 Rennes Cedex
		S: France

		N: Urs Thuermann
		E: urs.thuermann@volkswagen.de
		W: http://www.volkswagen.de
		D: Controller Area Network (network layer core)
		S: Brieffach 1776
		S: 38436 Wolfsburg
		S: Germany

		N: Jon Tombs
		E: jon@gte.esi.us.es
		W: http://www.esi.us.es/~jon

+2 −0

Original line number	Diff line number	Diff line
		@@ -262,6 +262,8 @@ mtrr.txt
		- how to use PPro Memory Type Range Registers to increase performance.
		mutex-design.txt
		- info on the generic mutex subsystem.
		namespaces/
		- directory with various information about namespaces
		nbd.txt
		- info on a TCP implementation of a network block device.
		netlabel/

+33 −0

Original line number	Diff line number	Diff line
		@@ -52,3 +52,36 @@ Description:
		facility is inherently dangerous, it is disabled by default
		for all devices except hubs. For more information, see
		Documentation/usb/persist.txt.

		What: /sys/bus/usb/device/.../power/connected_duration
		Date: January 2008
		KernelVersion: 2.6.25
		Contact: Sarah Sharp <sarah.a.sharp@intel.com>
		Description:
		If CONFIG_PM and CONFIG_USB_SUSPEND are enabled, then this file
		is present. When read, it returns the total time (in msec)
		that the USB device has been connected to the machine. This
		file is read-only.
		Users:
		PowerTOP <power@bughost.org>
		http://www.lesswatts.org/projects/powertop/

		What: /sys/bus/usb/device/.../power/active_duration
		Date: January 2008
		KernelVersion: 2.6.25
		Contact: Sarah Sharp <sarah.a.sharp@intel.com>
		Description:
		If CONFIG_PM and CONFIG_USB_SUSPEND are enabled, then this file
		is present. When read, it returns the total time (in msec)
		that the USB device has been active, i.e. not in a suspended
		state. This file is read-only.

		Tools can use this file and the connected_duration file to
		compute the percentage of time that a device has been active.
		For example,
		echo $((100 * `cat active_duration` / `cat connected_duration`))
		will give an integer percentage. Note that this does not
		account for counter wrap.
		Users:
		PowerTOP <power@bughost.org>
		http://www.lesswatts.org/projects/powertop/

0 → 100644

+14 −0

Original line number	Diff line number	Diff line
		What: /sys/kernel/uids/<uid>/cpu_shares
		Date: December 2007
		Contact: Dhaval Giani <dhaval@linux.vnet.ibm.com>
		Srivatsa Vaddagiri <vatsa@linux.vnet.ibm.com>
		Description:
		The /sys/kernel/uids/<uid>/cpu_shares tunable is used
		to set the cpu bandwidth a user is allowed. This is a
		propotional value. What that means is that if there
		are two users logged in, each with an equal number of
		shares, then they will get equal CPU bandwidth. Another
		example would be, if User A has shares = 1024 and user
		B has shares = 2048, User B will get twice the CPU
		bandwidth user A will. For more details refer
		Documentation/sched-design-CFS.txt