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

Commit 4045407f authored Jan 05, 2012 by Russell King

Merge branch 'restart-cleanup' into restart

Conflicts:
	arch/arm/kernel/setup.c

parents 59136ef3 4c5f830c

.mailmap

+2 −0

Original line number	Original line	Diff line number	Diff line
	@@ -68,6 +68,7 @@ Juha Yrjola <juha.yrjola@solidboot.com>
	Kay Sievers <kay.sievers@vrfy.org>		Kay Sievers <kay.sievers@vrfy.org>
	Kenneth W Chen <kenneth.w.chen@intel.com>		Kenneth W Chen <kenneth.w.chen@intel.com>
	Koushik <raghavendra.koushik@neterion.com>		Koushik <raghavendra.koushik@neterion.com>
			Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
	Leonid I Ananiev <leonid.i.ananiev@intel.com>		Leonid I Ananiev <leonid.i.ananiev@intel.com>
	Linas Vepstas <linas@austin.ibm.com>		Linas Vepstas <linas@austin.ibm.com>
	Mark Brown <broonie@sirena.org.uk>		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>		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>		Takashi YOSHII <takashi.yoshii.zj@renesas.com>
			Yusuke Goda <goda.yusuke@renesas.com>

CREDITS

+6 −3

Original line number	Original line	Diff line number	Diff line
	@@ -688,10 +688,13 @@ S: Oxfordshire, UK.

	N: Kees Cook		N: Kees Cook
	E: kees@outflux.net		E: kees@outflux.net
	W: http://outflux.net/		E: kees@ubuntu.com
	P: 1024D/17063E6D 9FA3 C49C 23C9 D1BC 2E30 1975 1FFF 4BA9 1706 3E6D		E: keescook@chromium.org
	D: Minor updates to SCSI types, added /proc/pid/maps protection		W: http://outflux.net/blog/
			P: 4096R/DC6DC026 A5C3 F68F 229D D60F 723E 6E13 8972 F4DF DC6D C026
			D: Various security things, bug fixes, and documentation.
	S: (ask for current address)		S: (ask for current address)
			S: Portland, Oregon
	S: USA		S: USA

	N: Robin Cornelius		N: Robin Cornelius

Documentation/ABI/testing/sysfs-block

+0 −13

Original line number	Original line	Diff line number	Diff line
	@@ -206,16 +206,3 @@ Description:
	when a discarded area is read the discard_zeroes_data		when a discarded area is read the discard_zeroes_data
	parameter will be set to one. Otherwise it will be 0 and		parameter will be set to one. Otherwise it will be 0 and
	the result of reading a discarded area is undefined.		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.

Documentation/ABI/testing/sysfs-bus-rbd

+0 −7

Original line number	Original line	Diff line number	Diff line
	@@ -57,13 +57,6 @@ create_snap

	$ echo <snap-name> > /sys/bus/rbd/devices/<dev-id>/snap_create		$ echo <snap-name> > /sys/bus/rbd/devices/<dev-id>/snap_create

	rollback_snap

	Rolls back data to the specified snapshot. This goes over the entire
	list of rados blocks and sends a rollback command to each.

	$ echo <snap-name> > /sys/bus/rbd/devices/<dev-id>/snap_rollback

	snap_*		snap_*

	A directory per each snapshot		A directory per each snapshot

Documentation/DocBook/drm.tmpl

+168 −140

File changed.

Preview size limit exceeded, changes collapsed.