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

Commit 47b64959 authored Nov 26, 2011 by Greg Kroah-Hartman

Merge 3.2-rc3 into usb-linus



This pulls in the latest USB bugfixes and helps a few of the drivers
merge nicer in the future due to changes in both branches.

Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

parents 3af5154a caca6a03

.mailmap

+2 −0

Original line number	Diff line number	Diff line
		@@ -68,6 +68,7 @@ Juha Yrjola <juha.yrjola@solidboot.com>
		Kay Sievers <kay.sievers@vrfy.org>
		Kenneth W Chen <kenneth.w.chen@intel.com>
		Koushik <raghavendra.koushik@neterion.com>
		Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
		Leonid I Ananiev <leonid.i.ananiev@intel.com>
		Linas Vepstas <linas@austin.ibm.com>
		Mark Brown <broonie@sirena.org.uk>
		@@ -111,3 +112,4 @@ Uwe Kleine-König <ukl@pengutronix.de>
		Uwe Kleine-König <Uwe.Kleine-Koenig@digi.com>
		Valdis Kletnieks <Valdis.Kletnieks@vt.edu>
		Takashi YOSHII <takashi.yoshii.zj@renesas.com>
		Yusuke Goda <goda.yusuke@renesas.com>

Documentation/ABI/testing/sysfs-block

+0 −13

Original line number	Diff line number	Diff line
		@@ -206,16 +206,3 @@ Description:
		when a discarded area is read the discard_zeroes_data
		parameter will be set to one. Otherwise it will be 0 and
		the result of reading a discarded area is undefined.
		What: /sys/block/<disk>/alias
		Date: Aug 2011
		Contact: Nao Nishijima <nao.nishijima.xt@hitachi.com>
		Description:
		A raw device name of a disk does not always point a same disk
		each boot-up time. Therefore, users have to use persistent
		device names, which udev creates when the kernel finds a disk,
		instead of raw device name. However, kernel doesn't show those
		persistent names on its messages (e.g. dmesg).
		This file can store an alias of the disk and it would be
		appeared in kernel messages if it is set. A disk can have an
		alias which length is up to 255bytes. Users can use alphabets,
		numbers, "-" and "_" in alias name. This file is writeonce.