Merge commit 'v2.6.26-rc9' into sched/devel (032f8278) · Commits · e / devices / android_kernel_xiaomi_markw

.gitignore

+9 −3

Original line number	Original line	Diff line number	Diff line
	@@ -3,6 +3,10 @@
	# subdirectories here. Add them in the ".gitignore" file		# subdirectories here. Add them in the ".gitignore" file
	# in that subdirectory instead.		# in that subdirectory instead.
	#		#
			# NOTE! Please use 'git-ls-files -i --exclude-standard'
			# command after changing this file, to see if there are
			# any tracked files which get ignored after the change.
			#
	# Normal rules		# Normal rules
	#		#
	.*		.*
	@@ -18,19 +22,21 @@
	*.lst		*.lst
	*.symtypes		*.symtypes
	*.order		*.order
			*.elf
			*.bin
			*.gz

	#		#
	# Top-level generic files		# Top-level generic files
	#		#
	tags		tags
	TAGS		TAGS
	vmlinux*		vmlinux
	!vmlinux.lds.S
	!vmlinux.lds.h
	System.map		System.map
	Module.markers		Module.markers
	Module.symvers		Module.symvers
	!.gitignore		!.gitignore
			!.mailmap

	#		#
	# Generated include files		# Generated include files

+3 −2

Original line number	Original line	Diff line number	Diff line
	@@ -2611,8 +2611,9 @@ S: Perth, Western Australia
	S: Australia		S: Australia

	N: Miguel Ojeda Sandonis		N: Miguel Ojeda Sandonis
	E: maxextreme@gmail.com		E: miguel.ojeda.sandonis@gmail.com
	W: http://maxextreme.googlepages.com/		W: http://miguelojeda.es
			W: http://jair.lab.fi.uva.es/~migojed/
	D: Author of the ks0108, cfag12864b and cfag12864bfb auxiliary display drivers.		D: Author of the ks0108, cfag12864b and cfag12864bfb auxiliary display drivers.
	D: Maintainer of the auxiliary display drivers tree (drivers/auxdisplay/*)		D: Maintainer of the auxiliary display drivers tree (drivers/auxdisplay/*)
	S: C/ Mieses 20, 9-B		S: C/ Mieses 20, 9-B

+6 −0

Original line number	Original line	Diff line number	Diff line
	@@ -24,6 +24,8 @@ There are three different groups of fields in the struct taskstats:

	4) Per-task and per-thread context switch count statistics		4) Per-task and per-thread context switch count statistics

			5) Time accounting for SMT machines

	Future extension should add fields to the end of the taskstats struct, and		Future extension should add fields to the end of the taskstats struct, and
	should not change the relative position of each field within the struct.		should not change the relative position of each field within the struct.

	@@ -164,4 +166,8 @@ struct taskstats {
	__u64 nvcsw; /* Context voluntary switch counter */		__u64 nvcsw; /* Context voluntary switch counter */
	__u64 nivcsw; /* Context involuntary switch counter */		__u64 nivcsw; /* Context involuntary switch counter */

			5) Time accounting for SMT machines
			__u64 ac_utimescaled; /* utime scaled on frequency etc */
			__u64 ac_stimescaled; /* stime scaled on frequency etc */
			__u64 cpu_scaled_run_real_total; /* scaled cpu_run_real_total */
	}		}

+2 −2

Original line number	Original line	Diff line number	Diff line
	@@ -3,7 +3,7 @@
	===================================		===================================

	License: GPLv2		License: GPLv2
	Author & Maintainer: Miguel Ojeda Sandonis <maxextreme@gmail.com>		Author & Maintainer: Miguel Ojeda Sandonis
	Date: 2006-10-27		Date: 2006-10-27


	@@ -22,7 +22,7 @@ Date: 2006-10-27
	1. DRIVER INFORMATION		1. DRIVER INFORMATION
	---------------------		---------------------

	This driver support one cfag12864b display at time.		This driver supports a cfag12864b LCD.


	---------------------		---------------------

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -4,7 +4,7 @@
	* Description: cfag12864b LCD userspace example program		* Description: cfag12864b LCD userspace example program
	* License: GPLv2		* License: GPLv2
	*		*
	* Author: Copyright (C) Miguel Ojeda Sandonis <maxextreme@gmail.com>		* Author: Copyright (C) Miguel Ojeda Sandonis
	* Date: 2006-10-31		* Date: 2006-10-31
	*		*
	* This program is free software; you can redistribute it and/or modify		* This program is free software; you can redistribute it and/or modify