Merge branch 'from-linus' into upstream (aad61439) · Commits · e / devices / android_kernel_fairphone_FP5

CREDITS

+2 −8

Original line number	Diff line number	Diff line
		@@ -1194,15 +1194,9 @@ S: Brecksville, OH 44141-1334
		S: USA

		N: Tristan Greaves
		E: Tristan.Greaves@icl.com
		E: tmg296@ecs.soton.ac.uk
		W: http://www.ecs.soton.ac.uk/~tmg296
		E: tristan@extricate.org
		W: http://www.extricate.org/
		D: Miscellaneous ipv4 sysctl patches
		S: 15 Little Mead
		S: Denmead
		S: Hampshire
		S: PO7 6HS
		S: United Kingdom

		N: Michael A. Griffith
		E: grif@cs.ucr.edu

+2 −1

Original line number	Diff line number	Diff line
		@@ -603,7 +603,8 @@ start exactly where you are now.


		----------
		Thanks to Paolo Ciarrocchi who allowed the "Development Process" section
		Thanks to Paolo Ciarrocchi who allowed the "Development Process"
		(http://linux.tar.bz/articles/2.6-development_process) section
		to be based on text he had written, and to Randy Dunlap and Gerrit
		Huizenga for some of the list of things you should and should not say.
		Also thanks to Pat Mochel, Hanna Linder, Randy Dunlap, Kay Sievers,

+5 −0

Original line number	Diff line number	Diff line
		@@ -246,6 +246,7 @@ class/
		devices/
		firmware/
		net/
		fs/

		devices/ contains a filesystem representation of the device tree. It maps
		directly to the internal kernel device tree, which is a hierarchy of
		@@ -264,6 +265,10 @@ drivers/ contains a directory for each device driver that is loaded
		for devices on that particular bus (this assumes that drivers do not
		span multiple bus types).

		fs/ contains a directory for some filesystems. Currently each
		filesystem wanting to export attributes must create its own hierarchy
		below fs/ (see ./fuse.txt for an example).


		More information can driver-model specific features can be found in
		Documentation/driver-model/.

+11 −1

Original line number	Diff line number	Diff line
		@@ -259,7 +259,17 @@ on the bus need to be capable of doing it, so this is something which needs
		to be handled by platform and generic code, not individual drivers.


		8. Obsolete functions
		8. Vendor and device identifications
		~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
		For the future, let's avoid adding device ids to include/linux/pci_ids.h.

		PCI_VENDOR_ID_xxx for vendors, and a hex constant for device ids.

		Rationale: PCI_VENDOR_ID_xxx constants are re-used, but device ids are not.
		Further, device ids are arbitrary hex numbers, normally used only in a
		single location, the pci_device_id table.

		9. Obsolete functions
		~~~~~~~~~~~~~~~~~~~~~
		There are several functions which you might come across when trying to
		port an old driver to the new PCI interface. They are no longer present

+1 −1

Original line number	Diff line number	Diff line
		@@ -140,7 +140,7 @@ IBM TP T41p s3_bios (2), switch to X after resume
		IBM TP T42 s3_bios (2)
		IBM ThinkPad T42p (2373-GTG) s3_bios (2)
		IBM TP X20 ??? (*)
		IBM TP X30 s3_bios (2)
		IBM TP X30 s3_bios, s3_mode (4)
		IBM TP X31 / Type 2672-XXH none (1), use radeontool (http://fdd.com/software/radeon/) to turn off backlight.
		IBM TP X32 none (1), but backlight is on and video is trashed after long suspend. s3_bios,s3_mode (4) works too. Perhaps that gets better results?
		IBM Thinkpad X40 Type 2371-7JG s3_bios,s3_mode (4)