Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 22a3e233 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge git://git.kernel.org/pub/scm/linux/kernel/git/bunk/trivial 

* git://git.kernel.org/pub/scm/linux/kernel/git/bunk/trivial:
  Remove obsolete #include <linux/config.h>
  remove obsolete swsusp_encrypt
  arch/arm26/Kconfig typos
  Documentation/IPMI typos
  Kconfig: Typos in net/sched/Kconfig
  v9fs: do not include linux/version.h
  Documentation/DocBook/mtdnand.tmpl: typo fixes
  typo fixes: specfic -> specific
  typo fixes in Documentation/networking/pktgen.txt
  typo fixes: occuring -> occurring
  typo fixes: infomation -> information
  typo fixes: disadvantadge -> disadvantage
  typo fixes: aquire -> acquire
  typo fixes: mecanism -> mechanism
  typo fixes: bandwith -> bandwidth
  fix a typo in the RTC_CLASS help text
  smb is no longer maintained

Manually merged trivial conflict in arch/um/kernel/vmlinux.lds.S
parents 39302175 6ab3d562

Documentation/DocBook/mtdnand.tmpl

+3 −3
Original line number Diff line number Diff line
@@ -189,9 +189,9 @@ static unsigned long baseaddr; 
	<sect1>

		<title>Partition defines</title>

		<para>

			If you want to divide your device into parititions, then

			enable the configuration switch CONFIG_MTD_PARITIONS and define

			a paritioning scheme suitable to your board.

			If you want to divide your device into partitions, then

			enable the configuration switch CONFIG_MTD_PARTITIONS and define

			a partitioning scheme suitable to your board.

		</para>

		<programlisting>

#define NUM_PARTITIONS 2

Documentation/arm/IXP4xx

+1 −1
Original line number Diff line number Diff line
@@ -85,7 +85,7 @@ IXP4xx provides two methods of accessing PCI memory space: 
2) If > 64MB of memory space is required, the IXP4xx can be 

   configured to use indirect registers to access PCI This allows 

   for up to 128MB (0x48000000 to 0x4fffffff) of memory on the bus. 

   The disadvantadge of this is that every PCI access requires 

   The disadvantage of this is that every PCI access requires 

   three local register accesses plus a spinlock, but in some 

   cases the performance hit is acceptable. In addition, you cannot 

   mmap() PCI devices in this case due to the indirect nature

Documentation/digiepca.txt

+1 −1
Original line number Diff line number Diff line
@@ -2,7 +2,7 @@ NOTE: This driver is obsolete. Digi provides a 2.6 driver (dgdm) at 
http://www.digi.com for PCI cards.  They no longer maintain this driver,

and have no 2.6 driver for ISA cards.



This driver requires a number of user-space tools.  They can be aquired from

This driver requires a number of user-space tools.  They can be acquired from

http://www.digi.com, but only works with 2.4 kernels.

Documentation/memory-barriers.txt

+1 −1
Original line number Diff line number Diff line
@@ -602,7 +602,7 @@ Consider the following sequence of events: 


This sequence of events is committed to the memory coherence system in an order

that the rest of the system might perceive as the unordered set of { STORE A,

STORE B, STORE C } all occuring before the unordered set of { STORE D, STORE E

STORE B, STORE C } all occurring before the unordered set of { STORE D, STORE E

}:



	+-------+       :      :

Documentation/networking/pktgen.txt

+1 −1
Original line number Diff line number Diff line
@@ -74,7 +74,7 @@ Examples: 
 pgset "pkt_size 9014"   sets packet size to 9014

 pgset "frags 5"         packet will consist of 5 fragments

 pgset "count 200000"    sets number of packets to send, set to zero

                         for continious sends untill explicitl stopped.

                         for continuous sends until explicitly stopped.



 pgset "delay 5000"      adds delay to hard_start_xmit(). nanoseconds