Merge branch 'linus' into stackprotector (b2aaf8f7) · Commits · e / devices / android_kernel_fairphone_FP4

.gitignore

+9 −3

Original line number	Diff line number	Diff line
		@@ -3,6 +3,10 @@
		# subdirectories here. Add them in the ".gitignore" file
		# 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
		#
		.*
		@@ -18,19 +22,21 @@
		*.lst
		*.symtypes
		*.order
		*.elf
		*.bin
		*.gz

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

		#
		# Generated include files

+2 −0

Original line number	Diff line number	Diff line
		@@ -96,4 +96,6 @@ Tejun Heo <htejun@gmail.com>
		Thomas Graf <tgraf@suug.ch>
		Tony Luck <tony.luck@intel.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>
		Valdis Kletnieks <Valdis.Kletnieks@vt.edu>

+12 −4

Original line number	Diff line number	Diff line
		@@ -317,6 +317,14 @@ S: 2322 37th Ave SW
		S: Seattle, Washington 98126-2010
		S: USA

		N: Muli Ben-Yehuda
		E: mulix@mulix.org
		E: muli@il.ibm.com
		W: http://www.mulix.org
		D: trident OSS sound driver, x86-64 dma-ops and Calgary IOMMU,
		D: KVM and Xen bits and other misc. hackery.
		S: Haifa, Israel

		N: Johannes Berg
		E: johannes@sipsolutions.net
		W: http://johannes.sipsolutions.net/
		@@ -2611,8 +2619,9 @@ S: Perth, Western Australia
		S: Australia

		N: Miguel Ojeda Sandonis
		E: maxextreme@gmail.com
		W: http://maxextreme.googlepages.com/
		E: miguel.ojeda.sandonis@gmail.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: Maintainer of the auxiliary display drivers tree (drivers/auxdisplay/*)
		S: C/ Mieses 20, 9-B
		@@ -3343,8 +3352,7 @@ S: Spain
		N: Linus Torvalds
		E: torvalds@linux-foundation.org
		D: Original kernel hacker
		S: 12725 SW Millikan Way, Suite 400
		S: Beaverton, Oregon 97005
		S: Portland, Oregon 97005
		S: USA

		N: Marcelo Tosatti

+0 −8

Original line number	Diff line number	Diff line
		@@ -89,8 +89,6 @@ cciss.txt
		- info, major/minor #'s for Compaq's SMART Array Controllers.
		cdrom/
		- directory with information on the CD-ROM drivers that Linux has.
		cli-sti-removal.txt
		- cli()/sti() removal guide.
		computone.txt
		- info on Computone Intelliport II/Plus Multiport Serial Driver.
		connector/
		@@ -161,8 +159,6 @@ hayes-esp.txt
		- info on using the Hayes ESP serial driver.
		highuid.txt
		- notes on the change from 16 bit to 32 bit user/group IDs.
		hpet.txt
		- High Precision Event Timer Driver for Linux.
		timers/
		- info on the timer related topics
		hw_random.txt
		@@ -253,8 +249,6 @@ mono.txt
		- how to execute Mono-based .NET binaries with the help of BINFMT_MISC.
		moxa-smartio
		- file with info on installing/using Moxa multiport serial driver.
		mtrr.txt
		- how to use PPro Memory Type Range Registers to increase performance.
		mutex-design.txt
		- info on the generic mutex subsystem.
		namespaces/
		@@ -361,8 +355,6 @@ telephony/
		- directory with info on telephony (e.g. voice over IP) support.
		time_interpolators.txt
		- info on time interpolators.
		tipar.txt
		- information about Parallel link cable for Texas Instruments handhelds.
		tty.txt
		- guide to the locking policies of the tty layer.
		uml/

+34 −0

Original line number	Diff line number	Diff line
		@@ -26,3 +26,37 @@ Description:
		I/O statistics of partition <part>. The format is the
		same as the above-written /sys/block/<disk>/stat
		format.


		What: /sys/block/<disk>/integrity/format
		Date: June 2008
		Contact: Martin K. Petersen <martin.petersen@oracle.com>
		Description:
		Metadata format for integrity capable block device.
		E.g. T10-DIF-TYPE1-CRC.


		What: /sys/block/<disk>/integrity/read_verify
		Date: June 2008
		Contact: Martin K. Petersen <martin.petersen@oracle.com>
		Description:
		Indicates whether the block layer should verify the
		integrity of read requests serviced by devices that
		support sending integrity metadata.


		What: /sys/block/<disk>/integrity/tag_size
		Date: June 2008
		Contact: Martin K. Petersen <martin.petersen@oracle.com>
		Description:
		Number of bytes of integrity tag space available per
		512 bytes of data.


		What: /sys/block/<disk>/integrity/write_generate
		Date: June 2008
		Contact: Martin K. Petersen <martin.petersen@oracle.com>
		Description:
		Indicates whether the block layer should automatically
		generate checksums for write requests bound for
		devices that support receiving integrity metadata.