Merge branch 'linus' into timers/hpet (2702e0a4) · Commits · e / devices / android_kernel_teracube_2e

.mailmap

+3 −1

Original line number	Original line	Diff line number	Diff line
	@@ -92,6 +92,7 @@ Rudolf Marek <R.Marek@sh.cvut.cz>
	Rui Saraiva <rmps@joel.ist.utl.pt>		Rui Saraiva <rmps@joel.ist.utl.pt>
	Sachin P Sant <ssant@in.ibm.com>		Sachin P Sant <ssant@in.ibm.com>
	Sam Ravnborg <sam@mars.ravnborg.org>		Sam Ravnborg <sam@mars.ravnborg.org>
			Sascha Hauer <s.hauer@pengutronix.de>
	S.Çağlar Onur <caglar@pardus.org.tr>		S.Çağlar Onur <caglar@pardus.org.tr>
	Simon Kelley <simon@thekelleys.org.uk>		Simon Kelley <simon@thekelleys.org.uk>
	Stéphane Witzmann <stephane.witzmann@ubpmes.univ-bpclermont.fr>		Stéphane Witzmann <stephane.witzmann@ubpmes.univ-bpclermont.fr>
	@@ -100,6 +101,7 @@ Tejun Heo <htejun@gmail.com>
	Thomas Graf <tgraf@suug.ch>		Thomas Graf <tgraf@suug.ch>
	Tony Luck <tony.luck@intel.com>		Tony Luck <tony.luck@intel.com>
	Tsuneo Yoshioka <Tsuneo.Yoshioka@f-secure.com>		Tsuneo Yoshioka <Tsuneo.Yoshioka@f-secure.com>
	Uwe Kleine-König <Uwe.Kleine-Koenig@digi.com>
	Uwe Kleine-König <ukleinek@informatik.uni-freiburg.de>		Uwe Kleine-König <ukleinek@informatik.uni-freiburg.de>
			Uwe Kleine-König <ukl@pengutronix.de>
			Uwe Kleine-König <Uwe.Kleine-Koenig@digi.com>
	Valdis Kletnieks <Valdis.Kletnieks@vt.edu>		Valdis Kletnieks <Valdis.Kletnieks@vt.edu>

+4 −8

Original line number	Original line	Diff line number	Diff line
	@@ -2166,7 +2166,6 @@ D: Initial implementation of VC's, pty's and select()

	N: Pavel Machek		N: Pavel Machek
	E: pavel@ucw.cz		E: pavel@ucw.cz
	E: pavel@suse.cz
	D: Softcursor for vga, hypertech cdrom support, vcsa bugfix, nbd		D: Softcursor for vga, hypertech cdrom support, vcsa bugfix, nbd
	D: sun4/330 port, capabilities for elf, speedup for rm on ext2, USB,		D: sun4/330 port, capabilities for elf, speedup for rm on ext2, USB,
	D: work on suspend-to-ram/disk, killing duplicates from ioctl32		D: work on suspend-to-ram/disk, killing duplicates from ioctl32
	@@ -3786,14 +3785,11 @@ S: The Netherlands

	N: David Woodhouse		N: David Woodhouse
	E: dwmw2@infradead.org		E: dwmw2@infradead.org
	D: ARCnet stuff, Applicom board driver, SO_BINDTODEVICE,		D: JFFS2 file system, Memory Technology Device subsystem,
	D: some Alpha platform porting from 2.0, Memory Technology Devices,
	D: Acquire watchdog timer, PC speaker driver maintenance,
	D: various other stuff that annoyed me by not working.		D: various other stuff that annoyed me by not working.
	S: c/o Red Hat Engineering		S: c/o Intel Corporation
	S: Rustat House		S: Pipers Way
	S: 60 Clifton Road		S: Swindon. SN3 1RJ
	S: Cambridge. CB1 7EG
	S: England		S: England

	N: Chris Wright		N: Chris Wright

+1 −1

Original line number	Original line	Diff line number	Diff line
	What: /sys/firmware/memmap/		What: /sys/firmware/memmap/
	Date: June 2008		Date: June 2008
	Contact: Bernhard Walle <bwalle@suse.de>		Contact: Bernhard Walle <bernhard.walle@gmx.de>
	Description:		Description:
	On all platforms, the firmware provides a memory map which the		On all platforms, the firmware provides a memory map which the
	kernel reads. The resources from that memory map are registered		kernel reads. The resources from that memory map are registered

+3 −1

Original line number	Original line	Diff line number	Diff line
	@@ -33,10 +33,12 @@ o Gnu make 3.79.1 # make --version
	o binutils 2.12 # ld -v		o binutils 2.12 # ld -v
	o util-linux 2.10o # fdformat --version		o util-linux 2.10o # fdformat --version
	o module-init-tools 0.9.10 # depmod -V		o module-init-tools 0.9.10 # depmod -V
	o e2fsprogs 1.29 # tune2fs		o e2fsprogs 1.41.4 # e2fsck -V
	o jfsutils 1.1.3 # fsck.jfs -V		o jfsutils 1.1.3 # fsck.jfs -V
	o reiserfsprogs 3.6.3 # reiserfsck -V 2>&1\|grep reiserfsprogs		o reiserfsprogs 3.6.3 # reiserfsck -V 2>&1\|grep reiserfsprogs
	o xfsprogs 2.6.0 # xfs_db -V		o xfsprogs 2.6.0 # xfs_db -V
			o squashfs-tools 4.0 # mksquashfs -version
			o btrfs-progs 0.18 # btrfsck
	o pcmciautils 004 # pccardctl -V		o pcmciautils 004 # pccardctl -V
	o quota-tools 3.09 # quota -V		o quota-tools 3.09 # quota -V
	o PPP 2.4.0 # pppd --version		o PPP 2.4.0 # pppd --version

+13 −5

Original line number	Original line	Diff line number	Diff line
	@@ -483,17 +483,25 @@ values. To do the latter, you can stick the following in your .emacs file:
	(* (max steps 1)		(* (max steps 1)
	c-basic-offset)))		c-basic-offset)))

			(add-hook 'c-mode-common-hook
			(lambda ()
			;; Add kernel style
			(c-add-style
			"linux-tabs-only"
			'("linux" (c-offsets-alist
			(arglist-cont-nonempty
			c-lineup-gcc-asm-reg
			c-lineup-arglist-tabs-only))))))

	(add-hook 'c-mode-hook		(add-hook 'c-mode-hook
	(lambda ()		(lambda ()
	(let ((filename (buffer-file-name)))		(let ((filename (buffer-file-name)))
	;; Enable kernel mode for the appropriate files		;; Enable kernel mode for the appropriate files
	(when (and filename		(when (and filename
	(string-match "~/src/linux-trees" filename))		(string-match (expand-file-name "~/src/linux-trees")
			filename))
	(setq indent-tabs-mode t)		(setq indent-tabs-mode t)
	(c-set-style "linux")		(c-set-style "linux-tabs-only")))))
	(c-set-offset 'arglist-cont-nonempty
	'(c-lineup-gcc-asm-reg
	c-lineup-arglist-tabs-only))))))

	This will make emacs go better with the kernel coding style for C		This will make emacs go better with the kernel coding style for C
	files below ~/src/linux-trees.		files below ~/src/linux-trees.