Merge branch 'for-linus2' of git://git.profusion.mobi/users/lucas/linux-2.6 (42933bac) · Commits · e / devices / android_kernel_teracube_emerald

CREDITS

+3 −3

Original line number	Original line	Diff line number	Diff line
	@@ -1677,7 +1677,7 @@ W: http://www.codemonkey.org.uk
	D: Assorted VIA x86 support.		D: Assorted VIA x86 support.
	D: 2.5 AGPGART overhaul.		D: 2.5 AGPGART overhaul.
	D: CPUFREQ maintenance.		D: CPUFREQ maintenance.
	D: Fedora kernel maintainence.		D: Fedora kernel maintenance.
	D: Misc/Other.		D: Misc/Other.
	S: 314 Littleton Rd, Westford, MA 01886, USA		S: 314 Littleton Rd, Westford, MA 01886, USA

	@@ -3211,7 +3211,7 @@ N: James Simmons
	E: jsimmons@infradead.org		E: jsimmons@infradead.org
	E: jsimmons@users.sf.net		E: jsimmons@users.sf.net
	D: Frame buffer device maintainer		D: Frame buffer device maintainer
	D: input layer developement		D: input layer development
	D: tty/console layer		D: tty/console layer
	D: various mipsel devices		D: various mipsel devices
	S: 115 Carmel Avenue		S: 115 Carmel Avenue
	@@ -3290,7 +3290,7 @@ S: USA
	N: Manfred Spraul		N: Manfred Spraul
	E: manfred@colorfullife.com		E: manfred@colorfullife.com
	W: http://www.colorfullife.com/~manfred		W: http://www.colorfullife.com/~manfred
	D: Lots of tiny hacks. Larger improvments to SysV IPC msg,		D: Lots of tiny hacks. Larger improvements to SysV IPC msg,
	D: slab, pipe, select.		D: slab, pipe, select.
	S: 71701 Schwieberdingen		S: 71701 Schwieberdingen
	S: Germany		S: Germany

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -29,7 +29,7 @@ Contact: Cornelia Huck <cornelia.huck@de.ibm.com>
	linux-s390@vger.kernel.org		linux-s390@vger.kernel.org
	Description: Contains the PIM/PAM/POM values, as reported by the		Description: Contains the PIM/PAM/POM values, as reported by the
	channel subsystem when last queried by the common I/O		channel subsystem when last queried by the common I/O
	layer (this implies that this attribute is not neccessarily		layer (this implies that this attribute is not necessarily
	in sync with the values current in the channel subsystem).		in sync with the values current in the channel subsystem).
	Note: This is an I/O-subchannel specific attribute.		Note: This is an I/O-subchannel specific attribute.
	Users: s390-tools, HAL		Users: s390-tools, HAL

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -33,5 +33,5 @@ Contact: Richard Purdie <rpurdie@rpsys.net>
	Description:		Description:
	Invert the LED on/off state. This parameter is specific to		Invert the LED on/off state. This parameter is specific to
	gpio and backlight triggers. In case of the backlight trigger,		gpio and backlight triggers. In case of the backlight trigger,
	it is usefull when driving a LED which is intended to indicate		it is useful when driving a LED which is intended to indicate
	a device in a standby like state.		a device in a standby like state.

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -40,7 +40,7 @@

	<para>Central frequency of the channel.</para>		<para>Central frequency of the channel.</para>

	<para>For ISDB-T the channels are usally transmitted with an offset of 143kHz. E.g. a		<para>For ISDB-T the channels are usually transmitted with an offset of 143kHz. E.g. a
	valid frequncy could be 474143 kHz. The stepping is bound to the bandwidth of		valid frequncy could be 474143 kHz. The stepping is bound to the bandwidth of
	the channel which is 6MHz.</para>		the channel which is 6MHz.</para>

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -139,7 +139,7 @@ consistently to the DiSEqC commands as described in the DiSEqC spec.</para>
	<section id="frontend_sec_tone">		<section id="frontend_sec_tone">
	<title>SEC continuous tone</title>		<title>SEC continuous tone</title>

	<para>The continous 22KHz tone is usually used with non-DiSEqC capable LNBs to switch the		<para>The continuous 22KHz tone is usually used with non-DiSEqC capable LNBs to switch the
	high/low band of a dual-band LNB. When using DiSEqC epuipment this voltage has to		high/low band of a dual-band LNB. When using DiSEqC epuipment this voltage has to
	be switched consistently to the DiSEqC commands as described in the DiSEqC		be switched consistently to the DiSEqC commands as described in the DiSEqC
	spec.</para>		spec.</para>