Merge commit 'v2.6.38' into release (5c129a86) · Commits · e / devices / android_kernel_teracube_2e

Documentation/networking/00-INDEX

+0 −6

Original line number	Original line	Diff line number	Diff line
	@@ -40,8 +40,6 @@ decnet.txt
	- info on using the DECnet networking layer in Linux.		- info on using the DECnet networking layer in Linux.
	depca.txt		depca.txt
	- the Digital DEPCA/EtherWORKS DE1?? and DE2?? LANCE Ethernet driver		- the Digital DEPCA/EtherWORKS DE1?? and DE2?? LANCE Ethernet driver
	dgrs.txt
	- the Digi International RightSwitch SE-X Ethernet driver
	dmfe.txt		dmfe.txt
	- info on the Davicom DM9102(A)/DM9132/DM9801 fast ethernet driver.		- info on the Davicom DM9102(A)/DM9132/DM9801 fast ethernet driver.
	e100.txt		e100.txt
	@@ -50,8 +48,6 @@ e1000.txt
	- info on Intel's E1000 line of gigabit ethernet boards		- info on Intel's E1000 line of gigabit ethernet boards
	eql.txt		eql.txt
	- serial IP load balancing		- serial IP load balancing
	ethertap.txt
	- the Ethertap user space packet reception and transmission driver
	ewrk3.txt		ewrk3.txt
	- the Digital EtherWORKS 3 DE203/4/5 Ethernet driver		- the Digital EtherWORKS 3 DE203/4/5 Ethernet driver
	filter.txt		filter.txt
	@@ -104,8 +100,6 @@ tuntap.txt
	- TUN/TAP device driver, allowing user space Rx/Tx of packets.		- TUN/TAP device driver, allowing user space Rx/Tx of packets.
	vortex.txt		vortex.txt
	- info on using 3Com Vortex (3c590, 3c592, 3c595, 3c597) Ethernet cards.		- info on using 3Com Vortex (3c590, 3c592, 3c595, 3c597) Ethernet cards.
	wavelan.txt
	- AT&T GIS (nee NCR) WaveLAN card: An Ethernet-like radio transceiver
	x25.txt		x25.txt
	- general info on X.25 development.		- general info on X.25 development.
	x25-iface.txt		x25-iface.txt

Documentation/networking/dns_resolver.txt

+8 −1

Original line number	Original line	Diff line number	Diff line
	@@ -61,7 +61,6 @@ before the more general line given above as the first match is the one taken.
	create dns_resolver foo:* * /usr/sbin/dns.foo %k		create dns_resolver foo:* * /usr/sbin/dns.foo %k



	=====		=====
	USAGE		USAGE
	=====		=====
	@@ -104,6 +103,14 @@ implemented in the module can be called after doing:
	returned also.		returned also.


			===============================
			READING DNS KEYS FROM USERSPACE
			===============================

			Keys of dns_resolver type can be read from userspace using keyctl_read() or
			"keyctl read/print/pipe".


	=========		=========
	MECHANISM		MECHANISM
	=========		=========

MAINTAINERS

+14 −6

Original line number	Original line	Diff line number	Diff line
	@@ -1010,6 +1010,15 @@ L: linux-samsung-soc@vger.kernel.org (moderated for non-subscribers)
	S: Maintained		S: Maintained
	F: arch/arm/mach-s5p*/		F: arch/arm/mach-s5p*/

			ARM/SAMSUNG MOBILE MACHINE SUPPORT
			M: Kyungmin Park <kyungmin.park@samsung.com>
			L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
			S: Maintained
			F: arch/arm/mach-s5pv210/mach-aquila.c
			F: arch/arm/mach-s5pv210/mach-goni.c
			F: arch/arm/mach-exynos4/mach-universal_c210.c
			F: arch/arm/mach-exynos4/mach-nuri.c

	ARM/SAMSUNG S5P SERIES FIMC SUPPORT		ARM/SAMSUNG S5P SERIES FIMC SUPPORT
	M: Kyungmin Park <kyungmin.park@samsung.com>		M: Kyungmin Park <kyungmin.park@samsung.com>
	M: Sylwester Nawrocki <s.nawrocki@samsung.com>		M: Sylwester Nawrocki <s.nawrocki@samsung.com>
	@@ -1467,6 +1476,7 @@ F: include/net/bluetooth/

	BONDING DRIVER		BONDING DRIVER
	M: Jay Vosburgh <fubar@us.ibm.com>		M: Jay Vosburgh <fubar@us.ibm.com>
			M: Andy Gospodarek <andy@greyhouse.net>
	L: netdev@vger.kernel.org		L: netdev@vger.kernel.org
	W: http://sourceforge.net/projects/bonding/		W: http://sourceforge.net/projects/bonding/
	S: Supported		S: Supported
	@@ -2033,7 +2043,7 @@ F: Documentation/scsi/dc395x.txt
	F: drivers/scsi/dc395x.*		F: drivers/scsi/dc395x.*

	DCCP PROTOCOL		DCCP PROTOCOL
	M: Arnaldo Carvalho de Melo <acme@ghostprotocols.net>		M: Gerrit Renker <gerrit@erg.abdn.ac.uk>
	L: dccp@vger.kernel.org		L: dccp@vger.kernel.org
	W: http://www.linuxfoundation.org/collaborate/workgroups/networking/dccp		W: http://www.linuxfoundation.org/collaborate/workgroups/networking/dccp
	S: Maintained		S: Maintained
	@@ -3519,7 +3529,7 @@ F: drivers/hwmon/jc42.c
	F: Documentation/hwmon/jc42		F: Documentation/hwmon/jc42

	JFS FILESYSTEM		JFS FILESYSTEM
	M: Dave Kleikamp <shaggy@linux.vnet.ibm.com>		M: Dave Kleikamp <shaggy@kernel.org>
	L: jfs-discussion@lists.sourceforge.net		L: jfs-discussion@lists.sourceforge.net
	W: http://jfs.sourceforge.net/		W: http://jfs.sourceforge.net/
	T: git git://git.kernel.org/pub/scm/linux/kernel/git/shaggy/jfs-2.6.git		T: git git://git.kernel.org/pub/scm/linux/kernel/git/shaggy/jfs-2.6.git
	@@ -4282,10 +4292,7 @@ S: Maintained
	F: net/sched/sch_netem.c		F: net/sched/sch_netem.c

	NETERION 10GbE DRIVERS (s2io/vxge)		NETERION 10GbE DRIVERS (s2io/vxge)
	M: Ramkrishna Vepa <ramkrishna.vepa@exar.com>		M: Jon Mason <jdmason@kudzu.us>
	M: Sivakumar Subramani <sivakumar.subramani@exar.com>
	M: Sreenivasa Honnur <sreenivasa.honnur@exar.com>
	M: Jon Mason <jon.mason@exar.com>
	L: netdev@vger.kernel.org		L: netdev@vger.kernel.org
	W: http://trac.neterion.com/cgi-bin/trac.cgi/wiki/Linux?Anonymous		W: http://trac.neterion.com/cgi-bin/trac.cgi/wiki/Linux?Anonymous
	W: http://trac.neterion.com/cgi-bin/trac.cgi/wiki/X3100Linux?Anonymous		W: http://trac.neterion.com/cgi-bin/trac.cgi/wiki/X3100Linux?Anonymous
	@@ -5171,6 +5178,7 @@ F: drivers/char/random.c

	RAPIDIO SUBSYSTEM		RAPIDIO SUBSYSTEM
	M: Matt Porter <mporter@kernel.crashing.org>		M: Matt Porter <mporter@kernel.crashing.org>
			M: Alexandre Bounine <alexandre.bounine@idt.com>
	S: Maintained		S: Maintained
	F: drivers/rapidio/		F: drivers/rapidio/

Makefile

+1 −1

Original line number	Original line	Diff line number	Diff line
	VERSION = 2		VERSION = 2
	PATCHLEVEL = 6		PATCHLEVEL = 6
	SUBLEVEL = 38		SUBLEVEL = 38
	EXTRAVERSION = -rc7		EXTRAVERSION =
	NAME = Flesh-Eating Bats with Fangs		NAME = Flesh-Eating Bats with Fangs

	# DOCUMENTATION		# DOCUMENTATION

arch/alpha/Kconfig

+1 −0

Original line number	Original line	Diff line number	Diff line
	@@ -11,6 +11,7 @@ config ALPHA
	select HAVE_GENERIC_HARDIRQS		select HAVE_GENERIC_HARDIRQS
	select GENERIC_IRQ_PROBE		select GENERIC_IRQ_PROBE
	select AUTO_IRQ_AFFINITY if SMP		select AUTO_IRQ_AFFINITY if SMP
			select GENERIC_HARDIRQS_NO_DEPRECATED
	help		help
	The Alpha is a 64-bit general-purpose processor designed and		The Alpha is a 64-bit general-purpose processor designed and
	marketed by the Digital Equipment Corporation of blessed memory,		marketed by the Digital Equipment Corporation of blessed memory,