Merge git://git.kernel.org/pub/scm/linux/kernel/git/bunk/trivial (f5bb3a5e) · Commits · 戴 / test

CREDITS

+3 −4

Original line number	Diff line number	Diff line
		@@ -508,12 +508,8 @@ D: REINER SCT cyberJack pinpad/e-com USB chipcard reader driver
		S: Germany

		N: Adrian Bunk
		E: bunk@stusta.de
		P: 1024D/4F12B400 B29C E71E FE19 6755 5C8A 84D4 99FC EA98 4F12 B400
		D: misc kernel hacking and testing
		S: Grasmeierstrasse 11
		S: 80805 Muenchen
		S: Germany

		N: Ray Burr
		E: ryb@nightmare.com
		@@ -1124,6 +1120,9 @@ S: 1150 Ringwood Court
		S: San Jose, California 95131
		S: USA

		N: Adam Fritzler
		E: mid@zigamorph.net

		N: Fernando Fuganti
		E: fuganti@conectiva.com.br
		E: fuganti@netbank.com.br

+1 −3

Original line number	Diff line number	Diff line
		@@ -154,7 +154,7 @@ firmware_class/
		- request_firmware() hotplug interface info.
		floppy.txt
		- notes and driver options for the floppy disk driver.
		fujitsu/
		frv/
		- Fujitsu FR-V Linux documentation.
		gpio.txt
		- overview of GPIO (General Purpose Input/Output) access conventions.
		@@ -364,8 +364,6 @@ sharedsubtree.txt
		- a description of shared subtrees for namespaces.
		smart-config.txt
		- description of the Smart Config makefile feature.
		smp.txt
		- a few notes on symmetric multi-processing.
		sony-laptop.txt
		- Sony Notebook Control Driver (SNC) Readme.
		sonypi.txt

+2 −14

Original line number	Diff line number	Diff line
		@@ -220,20 +220,8 @@ decreasing the likelihood of your MIME-attached change being accepted.
		Exception: If your mailer is mangling patches then someone may ask
		you to re-send them using MIME.


		WARNING: Some mailers like Mozilla send your messages with
		---- message header ----
		Content-Type: text/plain; charset=us-ascii; format=flowed
		---- message header ----
		The problem is that "format=flowed" makes some of the mailers
		on receiving side to replace TABs with spaces and do similar
		changes. Thus the patches from you can look corrupted.

		To fix this just make your mozilla defaults/pref/mailnews.js file to look like:
		pref("mailnews.send_plaintext_flowed", false); // RFC 2646=======
		pref("mailnews.display.disable_format_flowed_support", true);


		See Documentation/email-clients.txt for hints about configuring
		your e-mail client so that it sends your patches untouched.

		8) E-mail size.

+1 −1

Original line number	Diff line number	Diff line
		@@ -32,7 +32,7 @@ BARRIER IO before the access to the SMC chip because the AEN latch
		only needs occurs after the SMC IO write cycle. The routines that
		implement this work-around make an additional concession which is to
		disable interrupts during the IO sequence. Other hardware devices
		(the LogicPD CPLD) have registers in the same the physical memory
		(the LogicPD CPLD) have registers in the same physical memory
		region as the SMC chip. An interrupt might allow an access to one of
		those registers while SMC IO is being performed.

+4 −0

Original line number	Diff line number	Diff line
		@@ -16,3 +16,7 @@ echo 'echo "$@" >> /tmp/modprobe.log' >> /tmp/modprobe
		echo 'exec /sbin/modprobe "$@"' >> /tmp/modprobe
		chmod a+x /tmp/modprobe
		echo /tmp/modprobe > /proc/sys/kernel/modprobe

		Note that the above applies only when the kernel is requesting
		that the module be loaded -- it won't have any effect if that module
		is being loaded explicitly using "modprobe" from userspace.