diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-07-01 02:39:30 +0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-07-01 02:39:30 +0400 |
| commit | 22a3e233ca08a2ddc949ba1ae8f6e16ec7ef1a13 (patch) | |
| tree | 7ef158ba2c30e0dde2dc103d1904fae243759a6b /lib | |
| parent | 39302175c26d74be35715c05a0f342c9e64c21bf (diff) | |
| parent | 6ab3d5624e172c553004ecc862bfeac16d9d68b7 (diff) | |
| download | linux-22a3e233ca08a2ddc949ba1ae8f6e16ec7ef1a13.tar.xz | |
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
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/bust_spinlocks.c | 1 | ||||
| -rw-r--r-- | lib/extable.c | 1 | ||||
| -rw-r--r-- | lib/semaphore-sleepers.c | 1 | ||||
| -rw-r--r-- | lib/spinlock_debug.c | 1 | ||||
| -rw-r--r-- | lib/textsearch.c | 1 | ||||
| -rw-r--r-- | lib/ts_bm.c | 1 | ||||
| -rw-r--r-- | lib/ts_fsm.c | 1 | ||||
| -rw-r--r-- | lib/ts_kmp.c | 1 |
8 files changed, 0 insertions, 8 deletions
diff --git a/lib/bust_spinlocks.c b/lib/bust_spinlocks.c index 6bb7319e09a0..a2055bc3ef62 100644 --- a/lib/bust_spinlocks.c +++ b/lib/bust_spinlocks.c @@ -7,7 +7,6 @@ * and panic() information from reaching the user. */ -#include <linux/config.h> #include <linux/kernel.h> #include <linux/spinlock.h> #include <linux/tty.h> diff --git a/lib/extable.c b/lib/extable.c index 01c08b5836f5..463f4560f16d 100644 --- a/lib/extable.c +++ b/lib/extable.c @@ -9,7 +9,6 @@ * 2 of the License, or (at your option) any later version. */ -#include <linux/config.h> #include <linux/module.h> #include <linux/init.h> #include <linux/sort.h> diff --git a/lib/semaphore-sleepers.c b/lib/semaphore-sleepers.c index 4d5f18889fa5..128180523860 100644 --- a/lib/semaphore-sleepers.c +++ b/lib/semaphore-sleepers.c @@ -12,7 +12,6 @@ * * rw semaphores implemented November 1999 by Benjamin LaHaise <bcrl@kvack.org> */ -#include <linux/config.h> #include <linux/sched.h> #include <linux/err.h> #include <linux/init.h> diff --git a/lib/spinlock_debug.c b/lib/spinlock_debug.c index d8b6bb419d49..93c15ee3f8ea 100644 --- a/lib/spinlock_debug.c +++ b/lib/spinlock_debug.c @@ -6,7 +6,6 @@ * DEBUG_SPINLOCK. */ -#include <linux/config.h> #include <linux/spinlock.h> #include <linux/interrupt.h> #include <linux/delay.h> diff --git a/lib/textsearch.c b/lib/textsearch.c index 6f3093efbd7b..2cb4a437942e 100644 --- a/lib/textsearch.c +++ b/lib/textsearch.c @@ -93,7 +93,6 @@ * ========================================================================== */ -#include <linux/config.h> #include <linux/module.h> #include <linux/types.h> #include <linux/string.h> diff --git a/lib/ts_bm.c b/lib/ts_bm.c index c4c1ac5fbd1a..0110e4414805 100644 --- a/lib/ts_bm.c +++ b/lib/ts_bm.c @@ -35,7 +35,6 @@ * matchings spread over multiple fragments, then go BM. */ -#include <linux/config.h> #include <linux/kernel.h> #include <linux/module.h> #include <linux/types.h> diff --git a/lib/ts_fsm.c b/lib/ts_fsm.c index ca3211206eef..87847c2ae9e2 100644 --- a/lib/ts_fsm.c +++ b/lib/ts_fsm.c @@ -26,7 +26,6 @@ * however while in strict mode the average runtime can be better. */ -#include <linux/config.h> #include <linux/module.h> #include <linux/types.h> #include <linux/string.h> diff --git a/lib/ts_kmp.c b/lib/ts_kmp.c index 7fd45451b44a..3ced628cab4b 100644 --- a/lib/ts_kmp.c +++ b/lib/ts_kmp.c @@ -30,7 +30,6 @@ * [2] See finite automation theory */ -#include <linux/config.h> #include <linux/module.h> #include <linux/types.h> #include <linux/string.h> |