Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6fae9c25 authored Mar 01, 2011 by Jens Axboe

Merge commit 'v2.6.38-rc6' into for-2.6.39/core



Conflicts:
	block/cfq-iosched.c

Signed-off-by: Jens Axboe <jaxboe@fusionio.com>

parents c186794d f5412be5

.mailmap

+2 −0

Original line number	Original line	Diff line number	Diff line
	@@ -23,6 +23,7 @@ Andy Adamson <andros@citi.umich.edu>
	Arnaud Patard <arnaud.patard@rtp-net.org>		Arnaud Patard <arnaud.patard@rtp-net.org>
	Arnd Bergmann <arnd@arndb.de>		Arnd Bergmann <arnd@arndb.de>
	Axel Dyks <xl@xlsigned.net>		Axel Dyks <xl@xlsigned.net>
			Axel Lin <axel.lin@gmail.com>
	Ben Gardner <bgardner@wabtec.com>		Ben Gardner <bgardner@wabtec.com>
	Ben M Cahill <ben.m.cahill@intel.com>		Ben M Cahill <ben.m.cahill@intel.com>
	Björn Steinbrink <B.Steinbrink@gmx.de>		Björn Steinbrink <B.Steinbrink@gmx.de>
	@@ -105,3 +106,4 @@ Uwe Kleine-König <ukleinek@informatik.uni-freiburg.de>
	Uwe Kleine-König <ukl@pengutronix.de>		Uwe Kleine-König <ukl@pengutronix.de>
	Uwe Kleine-König <Uwe.Kleine-Koenig@digi.com>		Uwe Kleine-König <Uwe.Kleine-Koenig@digi.com>
	Valdis Kletnieks <Valdis.Kletnieks@vt.edu>		Valdis Kletnieks <Valdis.Kletnieks@vt.edu>
			Takashi YOSHII <takashi.yoshii.zj@renesas.com>

CREDITS

+2 −4

Original line number	Original line	Diff line number	Diff line
	@@ -2365,8 +2365,6 @@ E: acme@redhat.com
	W: http://oops.ghostprotocols.net:81/blog/		W: http://oops.ghostprotocols.net:81/blog/
	P: 1024D/9224DF01 D5DF E3BB E3C8 BCBB F8AD 841A B6AB 4681 9224 DF01		P: 1024D/9224DF01 D5DF E3BB E3C8 BCBB F8AD 841A B6AB 4681 9224 DF01
	D: IPX, LLC, DCCP, cyc2x, wl3501_cs, net/ hacks		D: IPX, LLC, DCCP, cyc2x, wl3501_cs, net/ hacks
	S: R. Brasílio Itiberê, 4270/1010 - Água Verde
	S: 80240-060 - Curitiba - Paraná
	S: Brazil		S: Brazil

	N: Karsten Merker		N: Karsten Merker
	@@ -2813,8 +2811,8 @@ D: CDROM driver "sonycd535" (Sony CDU-535/531)
	N: Stelian Pop		N: Stelian Pop
	E: stelian@popies.net		E: stelian@popies.net
	P: 1024D/EDBB6147 7B36 0E07 04BC 11DC A7A0 D3F7 7185 9E7A EDBB 6147		P: 1024D/EDBB6147 7B36 0E07 04BC 11DC A7A0 D3F7 7185 9E7A EDBB 6147
	D: sonypi, meye drivers, mct_u232 usb serial hacks		D: random kernel hacks
	S: Paris, France		S: Paimpont, France

	N: Pete Popov		N: Pete Popov
	E: pete_popov@yahoo.com		E: pete_popov@yahoo.com

Documentation/ABI/stable/thermal-notification

0 → 100644

+4 −0

Original line number	Original line	Diff line number	Diff line
			What: A notification mechanism for thermal related events
			Description:
			This interface enables notification for thermal related events.
			The notification is in the form of a netlink event.

Documentation/ABI/testing/sysfs-class-led

+9 −0

Original line number	Original line	Diff line number	Diff line
	@@ -26,3 +26,12 @@ Description:
	scheduler is chosen. Trigger specific parameters can appear in		scheduler is chosen. Trigger specific parameters can appear in
	/sys/class/leds/<led> once a given trigger is selected.		/sys/class/leds/<led> once a given trigger is selected.

			What: /sys/class/leds/<led>/inverted
			Date: January 2011
			KernelVersion: 2.6.38
			Contact: Richard Purdie <rpurdie@rpsys.net>
			Description:
			Invert the LED on/off state. This parameter is specific to
			gpio and backlight triggers. In case of the backlight trigger,
			it is usefull when driving a LED which is intended to indicate
			a device in a standby like state.

drivers/staging/batman-adv/sysfs-class-net-batman-adv→Documentation/ABI/testing/sysfs-class-net-batman-adv

+0 −0

File moved.