Merge branch 'topic/pcm-dma-fix' into topic/core-change (b00615d1) · Commits · e / devices / android_kernel_oneplus_sm7250

Documentation/i2c/busses/i2c-piix4

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -8,7 +8,7 @@ Supported adapters:
	Datasheet: Only available via NDA from ServerWorks		Datasheet: Only available via NDA from ServerWorks
	* ATI IXP200, IXP300, IXP400, SB600, SB700 and SB800 southbridges		* ATI IXP200, IXP300, IXP400, SB600, SB700 and SB800 southbridges
	Datasheet: Not publicly available		Datasheet: Not publicly available
	* AMD SB900		* AMD Hudson-2
	Datasheet: Not publicly available		Datasheet: Not publicly available
	* Standard Microsystems (SMSC) SLC90E66 (Victory66) southbridge		* Standard Microsystems (SMSC) SLC90E66 (Victory66) southbridge
	Datasheet: Publicly available at the SMSC website http://www.smsc.com		Datasheet: Publicly available at the SMSC website http://www.smsc.com

Documentation/thermal/sysfs-api.txt

+201 −188

Original line number	Original line	Diff line number	Diff line
	Generic Thermal Sysfs driver How To		Generic Thermal Sysfs driver How To
	=========================		===================================

	Written by Sujith Thomas <sujith.thomas@intel.com>, Zhang Rui <rui.zhang@intel.com>		Written by Sujith Thomas <sujith.thomas@intel.com>, Zhang Rui <rui.zhang@intel.com>

	@@ -10,20 +10,20 @@ Copyright (c) 2008 Intel Corporation

	0. Introduction		0. Introduction

	The generic thermal sysfs provides a set of interfaces for thermal zone devices (sensors)		The generic thermal sysfs provides a set of interfaces for thermal zone
	and thermal cooling devices (fan, processor...) to register with the thermal management		devices (sensors) and thermal cooling devices (fan, processor...) to register
	solution and to be a part of it.		with the thermal management solution and to be a part of it.

	This how-to focuses on enabling new thermal zone and cooling devices to participate		This how-to focuses on enabling new thermal zone and cooling devices to
	in thermal management.		participate in thermal management.
	This solution is platform independent and any type of thermal zone devices and		This solution is platform independent and any type of thermal zone devices
	cooling devices should be able to make use of the infrastructure.		and cooling devices should be able to make use of the infrastructure.

	The main task of the thermal sysfs driver is to expose thermal zone attributes as well		The main task of the thermal sysfs driver is to expose thermal zone attributes
	as cooling device attributes to the user space.		as well as cooling device attributes to the user space.
	An intelligent thermal management application can make decisions based on inputs		An intelligent thermal management application can make decisions based on
	from thermal zone attributes (the current temperature and trip point temperature)		inputs from thermal zone attributes (the current temperature and trip point
	and throttle appropriate devices.		temperature) and throttle appropriate devices.

	[0-*] denotes any positive number starting from 0		[0-*] denotes any positive number starting from 0
	[1-*] denotes any positive number starting from 1		[1-*] denotes any positive number starting from 1
	@@ -31,12 +31,12 @@ and throttle appropriate devices.
	1. thermal sysfs driver interface functions		1. thermal sysfs driver interface functions

	1.1 thermal zone device interface		1.1 thermal zone device interface
	1.1.1 struct thermal_zone_device thermal_zone_device_register(char name, int trips,		1.1.1 struct thermal_zone_device thermal_zone_device_register(char name,
	void devdata, struct thermal_zone_device_ops ops)		int trips, void devdata, struct thermal_zone_device_ops ops)

	This interface function adds a new thermal zone device (sensor) to		This interface function adds a new thermal zone device (sensor) to
	/sys/class/thermal folder as thermal_zone[0-*].		/sys/class/thermal folder as thermal_zone[0-*]. It tries to bind all the
	It tries to bind all the thermal cooling devices registered at the same time.		thermal cooling devices registered at the same time.

	name: the thermal zone name.		name: the thermal zone name.
	trips: the total number of trip points this thermal zone supports.		trips: the total number of trip points this thermal zone supports.
	@@ -46,8 +46,8 @@ and throttle appropriate devices.
	.unbind: unbind the thermal zone device with a thermal cooling device.		.unbind: unbind the thermal zone device with a thermal cooling device.
	.get_temp: get the current temperature of the thermal zone.		.get_temp: get the current temperature of the thermal zone.
	.get_mode: get the current mode (user/kernel) of the thermal zone.		.get_mode: get the current mode (user/kernel) of the thermal zone.
	"kernel" means thermal management is done in kernel.		- "kernel" means thermal management is done in kernel.
	"user" will prevent kernel thermal driver actions upon trip points		- "user" will prevent kernel thermal driver actions upon trip points
	so that user applications can take charge of thermal management.		so that user applications can take charge of thermal management.
	.set_mode: set the mode (user/kernel) of the thermal zone.		.set_mode: set the mode (user/kernel) of the thermal zone.
	.get_trip_type: get the type of certain trip point.		.get_trip_type: get the type of certain trip point.
	@@ -57,16 +57,16 @@ and throttle appropriate devices.
	1.1.2 void thermal_zone_device_unregister(struct thermal_zone_device *tz)		1.1.2 void thermal_zone_device_unregister(struct thermal_zone_device *tz)

	This interface function removes the thermal zone device.		This interface function removes the thermal zone device.
	It deletes the corresponding entry form /sys/class/thermal folder and unbind all		It deletes the corresponding entry form /sys/class/thermal folder and
	the thermal cooling devices it uses.		unbind all the thermal cooling devices it uses.

	1.2 thermal cooling device interface		1.2 thermal cooling device interface
	1.2.1 struct thermal_cooling_device thermal_cooling_device_register(char name,		1.2.1 struct thermal_cooling_device thermal_cooling_device_register(char name,
	void devdata, struct thermal_cooling_device_ops )		void devdata, struct thermal_cooling_device_ops )

	This interface function adds a new thermal cooling device (fan/processor/...) to		This interface function adds a new thermal cooling device (fan/processor/...)
	/sys/class/thermal/ folder as cooling_device[0-*].		to /sys/class/thermal/ folder as cooling_device[0-*]. It tries to bind itself
	It tries to bind itself to all the thermal zone devices register at the same time.		to all the thermal zone devices register at the same time.
	name: the cooling device name.		name: the cooling device name.
	devdata: device private data.		devdata: device private data.
	ops: thermal cooling devices call-backs.		ops: thermal cooling devices call-backs.
	@@ -77,15 +77,15 @@ and throttle appropriate devices.
	1.2.2 void thermal_cooling_device_unregister(struct thermal_cooling_device *cdev)		1.2.2 void thermal_cooling_device_unregister(struct thermal_cooling_device *cdev)

	This interface function remove the thermal cooling device.		This interface function remove the thermal cooling device.
	It deletes the corresponding entry form /sys/class/thermal folder and unbind		It deletes the corresponding entry form /sys/class/thermal folder and
	itself from all the thermal zone devices using it.		unbind itself from all the thermal zone devices using it.

	1.3 interface for binding a thermal zone device with a thermal cooling device		1.3 interface for binding a thermal zone device with a thermal cooling device
	1.3.1 int thermal_zone_bind_cooling_device(struct thermal_zone_device *tz,		1.3.1 int thermal_zone_bind_cooling_device(struct thermal_zone_device *tz,
	int trip, struct thermal_cooling_device *cdev);		int trip, struct thermal_cooling_device *cdev);

	This interface function bind a thermal cooling device to the certain trip point		This interface function bind a thermal cooling device to the certain trip
	of a thermal zone device.		point of a thermal zone device.
	This function is usually called in the thermal zone device .bind callback.		This function is usually called in the thermal zone device .bind callback.
	tz: the thermal zone device		tz: the thermal zone device
	cdev: thermal cooling device		cdev: thermal cooling device
	@@ -95,9 +95,9 @@ and throttle appropriate devices.
	1.3.2 int thermal_zone_unbind_cooling_device(struct thermal_zone_device *tz,		1.3.2 int thermal_zone_unbind_cooling_device(struct thermal_zone_device *tz,
	int trip, struct thermal_cooling_device *cdev);		int trip, struct thermal_cooling_device *cdev);

	This interface function unbind a thermal cooling device from the certain trip point		This interface function unbind a thermal cooling device from the certain
	of a thermal zone device.		trip point of a thermal zone device. This function is usually called in
	This function is usually called in the thermal zone device .unbind callback.		the thermal zone device .unbind callback.
	tz: the thermal zone device		tz: the thermal zone device
	cdev: thermal cooling device		cdev: thermal cooling device
	trip: indicates which trip point the cooling devices is associated with		trip: indicates which trip point the cooling devices is associated with
	@@ -114,153 +114,166 @@ if hwmon is compiled in or built as a module.

	Thermal zone device sys I/F, created once it's registered:		Thermal zone device sys I/F, created once it's registered:
	/sys/class/thermal/thermal_zone[0-*]:		/sys/class/thermal/thermal_zone[0-*]:
	\|-----type: Type of the thermal zone		\|---type: Type of the thermal zone
	\|-----temp: Current temperature		\|---temp: Current temperature
	\|-----mode: Working mode of the thermal zone		\|---mode: Working mode of the thermal zone
	\|-----trip_point_[0-*]_temp: Trip point temperature		\|---trip_point_[0-*]_temp: Trip point temperature
	\|-----trip_point_[0-*]_type: Trip point type		\|---trip_point_[0-*]_type: Trip point type

	Thermal cooling device sys I/F, created once it's registered:		Thermal cooling device sys I/F, created once it's registered:
	/sys/class/thermal/cooling_device[0-*]:		/sys/class/thermal/cooling_device[0-*]:
	\|-----type : Type of the cooling device(processor/fan/...)		\|---type: Type of the cooling device(processor/fan/...)
	\|-----max_state: Maximum cooling state of the cooling device		\|---max_state: Maximum cooling state of the cooling device
	\|-----cur_state: Current cooling state of the cooling device		\|---cur_state: Current cooling state of the cooling device


	These two dynamic attributes are created/removed in pairs.		Then next two dynamic attributes are created/removed in pairs. They represent
	They represent the relationship between a thermal zone and its associated cooling device.		the relationship between a thermal zone and its associated cooling device.
	They are created/removed for each		They are created/removed for each successful execution of
	thermal_zone_bind_cooling_device/thermal_zone_unbind_cooling_device successful execution.		thermal_zone_bind_cooling_device/thermal_zone_unbind_cooling_device.

	/sys/class/thermal/thermal_zone[0-*]		/sys/class/thermal/thermal_zone[0-*]:
	\|-----cdev[0-]: The [0-]th cooling device in the current thermal zone		\|---cdev[0-]: [0-]th cooling device in current thermal zone
	\|-----cdev[0-]_trip_point: Trip point that cdev[0-] is associated with		\|---cdev[0-]_trip_point: Trip point that cdev[0-] is associated with

	Besides the thermal zone device sysfs I/F and cooling device sysfs I/F,		Besides the thermal zone device sysfs I/F and cooling device sysfs I/F,
	the generic thermal driver also creates a hwmon sysfs I/F for each _type_ of		the generic thermal driver also creates a hwmon sysfs I/F for each _type_
	thermal zone device. E.g. the generic thermal driver registers one hwmon class device		of thermal zone device. E.g. the generic thermal driver registers one hwmon
	and build the associated hwmon sysfs I/F for all the registered ACPI thermal zones.		class device and build the associated hwmon sysfs I/F for all the registered
			ACPI thermal zones.

	/sys/class/hwmon/hwmon[0-*]:		/sys/class/hwmon/hwmon[0-*]:
	\|-----name: The type of the thermal zone devices.		\|---name: The type of the thermal zone devices
	\|-----temp[1-]_input: The current temperature of thermal zone [1-].		\|---temp[1-]_input: The current temperature of thermal zone [1-]
	\|-----temp[1-]_critical: The critical trip point of thermal zone [1-].		\|---temp[1-]_critical: The critical trip point of thermal zone [1-]

	Please read Documentation/hwmon/sysfs-interface for additional information.		Please read Documentation/hwmon/sysfs-interface for additional information.

	***************************		***************************
	* Thermal zone attributes *		* Thermal zone attributes *
	***************************		***************************

	type Strings which represent the thermal zone type.		type
			Strings which represent the thermal zone type.
	This is given by thermal zone driver as part of registration.		This is given by thermal zone driver as part of registration.
	Eg: "acpitz" indicates it's an ACPI thermal device.		E.g: "acpitz" indicates it's an ACPI thermal device.
	In order to keep it consistent with hwmon sys attribute,		In order to keep it consistent with hwmon sys attribute; this should
	this should be a short, lowercase string,		be a short, lowercase string, not containing spaces nor dashes.
	not containing spaces nor dashes.		RO, Required
	RO
	Required		temp
			Current temperature as reported by thermal zone (sensor).
	temp Current temperature as reported by thermal zone (sensor)
	Unit: millidegree Celsius		Unit: millidegree Celsius
	RO		RO, Required
	Required
			mode
	mode One of the predefined values in [kernel, user]		One of the predefined values in [kernel, user].
	This file gives information about the algorithm		This file gives information about the algorithm that is currently
	that is currently managing the thermal zone.		managing the thermal zone. It can be either default kernel based
	It can be either default kernel based algorithm		algorithm or user space application.
	or user space application.
	RW
	Optional
	kernel = Thermal management in kernel thermal zone driver.		kernel = Thermal management in kernel thermal zone driver.
	user = Preventing kernel thermal zone driver actions upon		user = Preventing kernel thermal zone driver actions upon
	trip points so that user application can take full		trip points so that user application can take full
	charge of the thermal management.		charge of the thermal management.
			RW, Optional

	trip_point_[0-*]_temp The temperature above which trip point will be fired		trip_point_[0-*]_temp
			The temperature above which trip point will be fired.
	Unit: millidegree Celsius		Unit: millidegree Celsius
	RO		RO, Optional
	Optional

	trip_point_[0-*]_type Strings which indicate the type of the trip point		trip_point_[0-*]_type
	E.g. it can be one of critical, hot, passive,		Strings which indicate the type of the trip point.
	active[0-*] for ACPI thermal zone.		E.g. it can be one of critical, hot, passive, active[0-*] for ACPI
	RO		thermal zone.
	Optional		RO, Optional

	cdev[0-*] Sysfs link to the thermal cooling device node where the sys I/F		cdev[0-*]
			Sysfs link to the thermal cooling device node where the sys I/F
	for cooling device throttling control represents.		for cooling device throttling control represents.
	RO		RO, Optional
	Optional
			cdev[0-*]_trip_point
	cdev[0-]_trip_point The trip point with which cdev[0-] is associated in this thermal zone		The trip point with which cdev[0-*] is associated in this thermal
	-1 means the cooling device is not associated with any trip point.		zone; -1 means the cooling device is not associated with any trip
	RO		point.
	Optional		RO, Optional

	******************************		passive
			Attribute is only present for zones in which the passive cooling
			policy is not supported by native thermal driver. Default is zero
			and can be set to a temperature (in millidegrees) to enable a
			passive trip point for the zone. Activation is done by polling with
			an interval of 1 second.
			Unit: millidegrees Celsius
			RW, Optional

			*****************************
	* Cooling device attributes *		* Cooling device attributes *
	******************************		*****************************

	type String which represents the type of device		type
	eg: For generic ACPI: this should be "Fan",		String which represents the type of device, e.g:
	"Processor" or "LCD"		- for generic ACPI: should be "Fan", "Processor" or "LCD"
	eg. For memory controller device on intel_menlow platform:		- for memory controller device on intel_menlow platform:
	this should be "Memory controller"		should be "Memory controller".
	RO		RO, Required
	Required
			max_state
	max_state The maximum permissible cooling state of this cooling device.		The maximum permissible cooling state of this cooling device.
	RO		RO, Required
	Required
			cur_state
	cur_state The current cooling state of this cooling device.		The current cooling state of this cooling device.
	the value can any integer numbers between 0 and max_state,		The value can any integer numbers between 0 and max_state:
	cur_state == 0 means no cooling		- cur_state == 0 means no cooling
	cur_state == max_state means the maximum cooling.		- cur_state == max_state means the maximum cooling.
	RW		RW, Required
	Required

	3. A simple implementation		3. A simple implementation

	ACPI thermal zone may support multiple trip points like critical/hot/passive/active.		ACPI thermal zone may support multiple trip points like critical, hot,
	If an ACPI thermal zone supports critical, passive, active[0] and active[1] at the same time,		passive, active. If an ACPI thermal zone supports critical, passive,
	it may register itself as a thermal_zone_device (thermal_zone1) with 4 trip points in all.		active[0] and active[1] at the same time, it may register itself as a
	It has one processor and one fan, which are both registered as thermal_cooling_device.		thermal_zone_device (thermal_zone1) with 4 trip points in all.
	If the processor is listed in _PSL method, and the fan is listed in _AL0 method,		It has one processor and one fan, which are both registered as
	the sys I/F structure will be built like this:		thermal_cooling_device.

			If the processor is listed in _PSL method, and the fan is listed in _AL0
			method, the sys I/F structure will be built like this:

	/sys/class/thermal:		/sys/class/thermal:

	\|thermal_zone1:		\|thermal_zone1:
	\|-----type: acpitz		\|---type: acpitz
	\|-----temp: 37000		\|---temp: 37000
	\|-----mode: kernel		\|---mode: kernel
	\|-----trip_point_0_temp: 100000		\|---trip_point_0_temp: 100000
	\|-----trip_point_0_type: critical		\|---trip_point_0_type: critical
	\|-----trip_point_1_temp: 80000		\|---trip_point_1_temp: 80000
	\|-----trip_point_1_type: passive		\|---trip_point_1_type: passive
	\|-----trip_point_2_temp: 70000		\|---trip_point_2_temp: 70000
	\|-----trip_point_2_type: active0		\|---trip_point_2_type: active0
	\|-----trip_point_3_temp: 60000		\|---trip_point_3_temp: 60000
	\|-----trip_point_3_type: active1		\|---trip_point_3_type: active1
	\|-----cdev0: --->/sys/class/thermal/cooling_device0		\|---cdev0: --->/sys/class/thermal/cooling_device0
	\|-----cdev0_trip_point: 1 /* cdev0 can be used for passive */		\|---cdev0_trip_point: 1 /* cdev0 can be used for passive */
	\|-----cdev1: --->/sys/class/thermal/cooling_device3		\|---cdev1: --->/sys/class/thermal/cooling_device3
	\|-----cdev1_trip_point: 2 /* cdev1 can be used for active[0]*/		\|---cdev1_trip_point: 2 /* cdev1 can be used for active[0]*/

	\|cooling_device0:		\|cooling_device0:
	\|-----type: Processor		\|---type: Processor
	\|-----max_state: 8		\|---max_state: 8
	\|-----cur_state: 0		\|---cur_state: 0

	\|cooling_device3:		\|cooling_device3:
	\|-----type: Fan		\|---type: Fan
	\|-----max_state: 2		\|---max_state: 2
	\|-----cur_state: 0		\|---cur_state: 0

	/sys/class/hwmon:		/sys/class/hwmon:

	\|hwmon0:		\|hwmon0:
	\|-----name: acpitz		\|---name: acpitz
	\|-----temp1_input: 37000		\|---temp1_input: 37000
	\|-----temp1_crit: 100000		\|---temp1_crit: 100000

Documentation/vm/page-types.c

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -218,7 +218,7 @@ static void fatal(const char *x, ...)
	exit(EXIT_FAILURE);		exit(EXIT_FAILURE);
	}		}

	int checked_open(const char *pathname, int flags)		static int checked_open(const char *pathname, int flags)
	{		{
	int fd = open(pathname, flags);		int fd = open(pathname, flags);

MAINTAINERS

+28 −24

Original line number	Original line	Diff line number	Diff line
	@@ -182,7 +182,7 @@ M: Ron Minnich <rminnich@sandia.gov>
	M: Latchesar Ionkov <lucho@ionkov.net>		M: Latchesar Ionkov <lucho@ionkov.net>
	L: v9fs-developer@lists.sourceforge.net		L: v9fs-developer@lists.sourceforge.net
	W: http://swik.net/v9fs		W: http://swik.net/v9fs
	T: git git://git.kernel.org/pub/scm/linux/kernel/ericvh/v9fs.git		T: git git://git.kernel.org/pub/scm/linux/kernel/git/ericvh/v9fs.git
	S: Maintained		S: Maintained
	F: Documentation/filesystems/9p.txt		F: Documentation/filesystems/9p.txt
	F: fs/9p/		F: fs/9p/
	@@ -906,7 +906,6 @@ M: Karol Kozimor <sziwan@users.sourceforge.net>
	L: acpi4asus-user@lists.sourceforge.net		L: acpi4asus-user@lists.sourceforge.net
	W: http://acpi4asus.sf.net		W: http://acpi4asus.sf.net
	S: Maintained		S: Maintained
	F: arch/x86/kernel/acpi/boot.c
	F: drivers/platform/x86/asus_acpi.c		F: drivers/platform/x86/asus_acpi.c

	ASUS ASB100 HARDWARE MONITOR DRIVER		ASUS ASB100 HARDWARE MONITOR DRIVER
	@@ -1245,8 +1244,7 @@ S: Supported
	F: drivers/net/tg3.*		F: drivers/net/tg3.*

	BROCADE BFA FC SCSI DRIVER		BROCADE BFA FC SCSI DRIVER
	P: Jing Huang		M: Jing Huang <huangj@brocade.com>
	M: huangj@brocade.com
	L: linux-scsi@vger.kernel.org		L: linux-scsi@vger.kernel.org
	S: Supported		S: Supported
	F: drivers/scsi/bfa/		F: drivers/scsi/bfa/
	@@ -2825,7 +2823,7 @@ F: drivers/infiniband/hw/ipath/

	IPMI SUBSYSTEM		IPMI SUBSYSTEM
	M: Corey Minyard <minyard@acm.org>		M: Corey Minyard <minyard@acm.org>
	L: openipmi-developer@lists.sourceforge.net		L: openipmi-developer@lists.sourceforge.net (moderated for non-subscribers)
	W: http://openipmi.sourceforge.net/		W: http://openipmi.sourceforge.net/
	S: Supported		S: Supported
	F: Documentation/IPMI.txt		F: Documentation/IPMI.txt
	@@ -3086,9 +3084,13 @@ F: kernel/kgdb.c

	KMEMCHECK		KMEMCHECK
	M: Vegard Nossum <vegardno@ifi.uio.no>		M: Vegard Nossum <vegardno@ifi.uio.no>
	P Pekka Enberg		M: Pekka Enberg <penberg@cs.helsinki.fi>
	M: penberg@cs.helsinki.fi
	S: Maintained		S: Maintained
			F: Documentation/kmemcheck.txt
			F: arch/x86/include/asm/kmemcheck.h
			F: arch/x86/mm/kmemcheck/
			F: include/linux/kmemcheck.h
			F: mm/kmemcheck.c

	KMEMLEAK		KMEMLEAK
	M: Catalin Marinas <catalin.marinas@arm.com>		M: Catalin Marinas <catalin.marinas@arm.com>
	@@ -3618,7 +3620,7 @@ L: netfilter@vger.kernel.org
	L: coreteam@netfilter.org		L: coreteam@netfilter.org
	W: http://www.netfilter.org/		W: http://www.netfilter.org/
	W: http://www.iptables.org/		W: http://www.iptables.org/
	T: git://git.kernel.org/pub/scm/linux/kernel/git/kaber/nf-2.6.git		T: git git://git.kernel.org/pub/scm/linux/kernel/git/kaber/nf-2.6.git
	S: Supported		S: Supported
	F: include/linux/netfilter*		F: include/linux/netfilter*
	F: include/linux/netfilter/		F: include/linux/netfilter/
	@@ -3665,6 +3667,7 @@ L: netdev@vger.kernel.org
	W: http://www.linuxfoundation.org/en/Net		W: http://www.linuxfoundation.org/en/Net
	W: http://patchwork.ozlabs.org/project/netdev/list/		W: http://patchwork.ozlabs.org/project/netdev/list/
	T: git git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6.git		T: git git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6.git
			T: git git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next-2.6.git
	S: Maintained		S: Maintained
	F: net/		F: net/
	F: include/net/		F: include/net/
	@@ -4329,6 +4332,8 @@ F: drivers/video/aty/aty128fb.c

	RALINK RT2X00 WIRELESS LAN DRIVER		RALINK RT2X00 WIRELESS LAN DRIVER
	P: rt2x00 project		P: rt2x00 project
			M: Ivo van Doorn <IvDoorn@gmail.com>
			M: Gertjan van Wingerde <gwingerde@gmail.com>
	L: linux-wireless@vger.kernel.org		L: linux-wireless@vger.kernel.org
	L: users@rt2x00.serialmonkey.com (moderated for non-subscribers)		L: users@rt2x00.serialmonkey.com (moderated for non-subscribers)
	W: http://rt2x00.serialmonkey.com/		W: http://rt2x00.serialmonkey.com/
	@@ -4416,7 +4421,7 @@ RFKILL
	M: Johannes Berg <johannes@sipsolutions.net>		M: Johannes Berg <johannes@sipsolutions.net>
	L: linux-wireless@vger.kernel.org		L: linux-wireless@vger.kernel.org
	S: Maintained		S: Maintained
	F Documentation/rfkill.txt		F: Documentation/rfkill.txt
	F: net/rfkill/		F: net/rfkill/

	RISCOM8 DRIVER		RISCOM8 DRIVER
	@@ -4636,7 +4641,7 @@ F: drivers/mmc/host/sdhci-s3c.c
	SECURITY SUBSYSTEM		SECURITY SUBSYSTEM
	M: James Morris <jmorris@namei.org>		M: James Morris <jmorris@namei.org>
	L: linux-security-module@vger.kernel.org (suggested Cc:)		L: linux-security-module@vger.kernel.org (suggested Cc:)
	T: git git://www.kernel.org/pub/scm/linux/kernel/git/jmorris/security-testing-2.6.git		T: git git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/security-testing-2.6.git
	W: http://security.wiki.kernel.org/		W: http://security.wiki.kernel.org/
	S: Supported		S: Supported
	F: security/		F: security/
	@@ -4672,8 +4677,7 @@ F: include/linux/ata.h
	F: include/linux/libata.h		F: include/linux/libata.h

	SERVER ENGINES 10Gbps iSCSI - BladeEngine 2 DRIVER		SERVER ENGINES 10Gbps iSCSI - BladeEngine 2 DRIVER
	P: Jayamohan Kallickal		M: Jayamohan Kallickal <jayamohank@serverengines.com>
	M: jayamohank@serverengines.com
	L: linux-scsi@vger.kernel.org		L: linux-scsi@vger.kernel.org
	W: http://www.serverengines.com		W: http://www.serverengines.com
	S: Supported		S: Supported
	@@ -5684,7 +5688,7 @@ F: include/linux/vlynq.h

	VMWARE VMXNET3 ETHERNET DRIVER		VMWARE VMXNET3 ETHERNET DRIVER
	M: Shreyas Bhatewara <sbhatewara@vmware.com>		M: Shreyas Bhatewara <sbhatewara@vmware.com>
	M: VMware, Inc. <pv-drivers@vmware.com>		M: "VMware, Inc." <pv-drivers@vmware.com>
	L: netdev@vger.kernel.org		L: netdev@vger.kernel.org
	S: Maintained		S: Maintained
	F: drivers/net/vmxnet3/		F: drivers/net/vmxnet3/

Makefile

+2 −2

Original line number	Original line	Diff line number	Diff line
	VERSION = 2		VERSION = 2
	PATCHLEVEL = 6		PATCHLEVEL = 6
	SUBLEVEL = 32		SUBLEVEL = 32
	EXTRAVERSION = -rc6		EXTRAVERSION = -rc8
	NAME = Man-Eating Seals of Antiquity		NAME = Man-Eating Seals of Antiquity

	# DOCUMENTATION		# DOCUMENTATION
	@@ -221,7 +221,7 @@ CONFIG_SHELL := $(shell if [ -x "$$BASH" ]; then echo $$BASH; \

	HOSTCC = gcc		HOSTCC = gcc
	HOSTCXX = g++		HOSTCXX = g++
	HOSTCFLAGS = -Wall -Wstrict-prototypes -O2 -fomit-frame-pointer		HOSTCFLAGS = -Wall -Wmissing-prototypes -Wstrict-prototypes -O2 -fomit-frame-pointer
	HOSTCXXFLAGS = -O2		HOSTCXXFLAGS = -O2

	# Decide whether to build built-in, modular, or both.		# Decide whether to build built-in, modular, or both.