Commit 489f7ab6 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: (31 commits)
  trivial: remove the trivial patch monkey's name from SubmittingPatches
  trivial: Fix a typo in comment of addrconf_dad_start()
  trivial: usb: fix missing space typo in doc
  trivial: pci hotplug: adding __init/__exit macros to sgi_hotplug
  trivial: Remove the hyphen from git commands
  trivial: fix ETIMEOUT -> ETIMEDOUT typos
  trivial: Kconfig: .ko is normally not included in module names
  trivial: SubmittingPatches: fix typo
  trivial: Documentation/dell_rbu.txt: fix typos
  trivial: Fix Pavel's address in MAINTAINERS
  trivial: ftrace:fix description of trace directory
  trivial: unnecessary (void*) cast removal in sound/oss/msnd.c
  trivial: input/misc: Fix typo in Kconfig
  trivial: fix grammo in bus_for_each_dev() kerneldoc
  trivial: rbtree.txt: fix rb_entry() parameters in sample code
  trivial: spelling fix in ppc code comments
  trivial: fix typo in bio_alloc kernel doc
  trivial: Documentation/rbtree.txt: cleanup kerneldoc of rbtree.txt
  trivial: Miscellaneous documentation typo fixes
  trivial: fix typo milisecond/millisecond for documentation and source comments.
  ...
parents b322b781 82d27b2b

.gitignore

+1 −1
Original line number Diff line number Diff line
@@ -3,7 +3,7 @@ 
# subdirectories here. Add them in the ".gitignore" file

# in that subdirectory instead.

#

# NOTE! Please use 'git-ls-files -i --exclude-standard'

# 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.

#

Documentation/CodingStyle

+2 −2
Original line number Diff line number Diff line
@@ -698,8 +698,8 @@ very often is not. Abundant use of the inline keyword leads to a much bigger 
kernel, which in turn slows the system as a whole down, due to a bigger

icache footprint for the CPU and simply because there is less memory

available for the pagecache. Just think about it; a pagecache miss causes a

disk seek, which easily takes 5 miliseconds. There are a LOT of cpu cycles

that can go into these 5 miliseconds.

disk seek, which easily takes 5 milliseconds. There are a LOT of cpu cycles

that can go into these 5 milliseconds.



A reasonable rule of thumb is to not put inline at functions that have more

than 3 lines of code in them. An exception to this rule are the cases where

Documentation/DMA-API.txt

+2 −2
Original line number Diff line number Diff line
@@ -676,8 +676,8 @@ this directory the following files can currently be found: 
	dma-api/all_errors	This file contains a numeric value. If this

				value is not equal to zero the debugging code

				will print a warning for every error it finds

				into the kernel log. Be carefull with this

				option. It can easily flood your logs.

				into the kernel log. Be careful with this

				option, as it can easily flood your logs.



	dma-api/disabled	This read-only file contains the character 'Y'

				if the debugging code is disabled. This can

Documentation/RCU/rculist_nulls.txt

+1 −1
Original line number Diff line number Diff line
@@ -118,7 +118,7 @@ to another chain) checking the final 'nulls' value if 
the lookup met the end of chain. If final 'nulls' value

is not the slot number, then we must restart the lookup at

the beginning. If the object was moved to the same chain,

then the reader doesnt care : It might eventually

then the reader doesn't care : It might eventually

scan the list again without harm.

Documentation/SM501.txt

+1 −1
Original line number Diff line number Diff line
@@ -5,7 +5,7 @@ Copyright 2006, 2007 Simtec Electronics 


The Silicon Motion SM501 multimedia companion chip is a multifunction device

which may provide numerous interfaces including USB host controller USB gadget,

Asyncronous Serial ports, Audio functions and a dual display video interface.

asynchronous serial ports, audio functions, and a dual display video interface.

The device may be connected by PCI or local bus with varying functions enabled.



Core

CRA Git | Maintained and supported by SUSTech CRA and CCSE