Commit 57c44c5f authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial 

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial: (24 commits)
  trivial: chack -> check typo fix in main Makefile
  trivial: Add a space (and a comma) to a printk in 8250 driver
  trivial: Fix misspelling of "firmware" in docs for ncr53c8xx/sym53c8xx
  trivial: Fix misspelling of "firmware" in powerpc Makefile
  trivial: Fix misspelling of "firmware" in usb.c
  trivial: Fix misspelling of "firmware" in qla1280.c
  trivial: Fix misspelling of "firmware" in a100u2w.c
  trivial: Fix misspelling of "firmware" in megaraid.c
  trivial: Fix misspelling of "firmware" in ql4_mbx.c
  trivial: Fix misspelling of "firmware" in acpi_memhotplug.c
  trivial: Fix misspelling of "firmware" in ipw2100.c
  trivial: Fix misspelling of "firmware" in atmel.c
  trivial: Fix misspelled firmware in Kconfig
  trivial: fix an -> a typos in documentation and comments
  trivial: fix then -> than typos in comments and documentation
  trivial: update Jesper Juhl CREDITS entry with new email
  trivial: fix singal -> signal typo
  trivial: Fix incorrect use of "loose" in event.c
  trivial: printk: fix indentation of new_text_line declaration
  trivial: rtc-stk17ta8: fix sparse warning
  ...
parents 76052749 5a9e67b1

CREDITS

+1 −1
Original line number Diff line number Diff line
@@ -1681,7 +1681,7 @@ E: ajoshi@shell.unixbox.com 
D: fbdev hacking



N: Jesper Juhl

E: jesper.juhl@gmail.com

E: jj@chaosbits.net

D: Various fixes, cleanups and minor features all over the tree.

D: Wrote initial version of the hdaps driver (since passed on to others).

S: Lemnosvej 1, 3.tv

Documentation/dell_rbu.txt

+2 −2
Original line number Diff line number Diff line
@@ -81,8 +81,8 @@ Until this step is completed the driver cannot be unloaded. 
Also echoing either mono ,packet or init in to image_type will free up the

memory allocated by the driver.



If an user by accident executes steps 1 and 3 above without executing step 2;

it will make the /sys/class/firmware/dell_rbu/ entries to disappear.

If a user by accident executes steps 1 and 3 above without executing step 2;

it will make the /sys/class/firmware/dell_rbu/ entries disappear.

The entries can be recreated by doing the following

echo init > /sys/devices/platform/dell_rbu/image_type

NOTE: echoing init in image_type does not change it original value.

Documentation/hwmon/abituguru-datasheet

+3 −3
Original line number Diff line number Diff line
@@ -74,7 +74,7 @@ a sensor. 
Notice that some banks have both a read and a write address this is how the

uGuru determines if a read from or a write to the bank is taking place, thus

when reading you should always use the read address and when writing the

write address. The write address is always one (1) more then the read address.

write address. The write address is always one (1) more than the read address.





uGuru ready
@@ -224,7 +224,7 @@ Bit 3: Beep if alarm (RW) 
Bit 4: 1 if alarm cause measured temp is over the warning threshold	(R)

Bit 5: 1 if alarm cause measured volt is over the max threshold		(R)

Bit 6: 1 if alarm cause measured volt is under the min threshold	(R)

Bit 7: Volt sensor: Shutdown if alarm persist for more then 4 seconds	(RW)

Bit 7: Volt sensor: Shutdown if alarm persist for more than 4 seconds	(RW)

       Temp sensor: Shutdown if temp is over the shutdown threshold	(RW)



*  This bit is only honored/used by the uGuru if a temp sensor is connected
@@ -293,7 +293,7 @@ Byte 0: 
Alarm behaviour for the selected sensor. A 1 enables the described behaviour.

Bit 0: Give an alarm if measured rpm is under the min threshold	(RW)

Bit 3: Beep if alarm						(RW)

Bit 7: Shutdown if alarm persist for more then 4 seconds	(RW)

Bit 7: Shutdown if alarm persist for more than 4 seconds	(RW)



Byte 1:

min threshold (scale as bank 0x26)

Documentation/laptops/thinkpad-acpi.txt

+1 −1
Original line number Diff line number Diff line
@@ -1475,7 +1475,7 @@ Sysfs interface changelog: 


0x020100:	Marker for thinkpad-acpi with hot key NVRAM polling

		support.  If you must, use it to know you should not

		start an userspace NVRAM poller (allows to detect when

		start a userspace NVRAM poller (allows to detect when

		NVRAM is compiled out by the user because it is

		unneeded/undesired in the first place).

0x020101:	Marker for thinkpad-acpi with hot key NVRAM polling

Documentation/networking/rxrpc.txt

+1 −1
Original line number Diff line number Diff line
@@ -540,7 +540,7 @@ A client would issue an operation by: 
     MSG_MORE should be set in msghdr::msg_flags on all but the last part of

     the request.  Multiple requests may be made simultaneously.



     If a call is intended to go to a destination other then the default

     If a call is intended to go to a destination other than the default

     specified through connect(), then msghdr::msg_name should be set on the

     first request message of that call.

CRA Git | Maintained and supported by SUSTech CRA and CCSE