diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-07-01 00:39:30 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-07-01 00:39:30 +0200 |
| commit | 22a3e233ca08a2ddc949ba1ae8f6e16ec7ef1a13 (patch) | |
| tree | 7ef158ba2c30e0dde2dc103d1904fae243759a6b /ipc | |
| parent | Merge git://git.kernel.org/pub/scm/linux/kernel/git/brodo/pcmcia-2.6/ (diff) | |
| parent | Remove obsolete #include <linux/config.h> (diff) | |
| download | linux-22a3e233ca08a2ddc949ba1ae8f6e16ec7ef1a13.tar.xz linux-22a3e233ca08a2ddc949ba1ae8f6e16ec7ef1a13.zip | |
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 'ipc')
| -rw-r--r-- | ipc/compat.c | 1 | ||||
| -rw-r--r-- | ipc/msg.c | 1 | ||||
| -rw-r--r-- | ipc/sem.c | 1 | ||||
| -rw-r--r-- | ipc/shm.c | 1 | ||||
| -rw-r--r-- | ipc/util.c | 1 |
5 files changed, 0 insertions, 5 deletions
diff --git a/ipc/compat.c b/ipc/compat.c index a544dfbb082a..4d20cfd38f0a 100644 --- a/ipc/compat.c +++ b/ipc/compat.c @@ -21,7 +21,6 @@ * */ #include <linux/compat.h> -#include <linux/config.h> #include <linux/errno.h> #include <linux/highuid.h> #include <linux/init.h> diff --git a/ipc/msg.c b/ipc/msg.c index 00f015a092d2..cd92d342953e 100644 --- a/ipc/msg.c +++ b/ipc/msg.c @@ -19,7 +19,6 @@ */ #include <linux/capability.h> -#include <linux/config.h> #include <linux/slab.h> #include <linux/msg.h> #include <linux/spinlock.h> diff --git a/ipc/sem.c b/ipc/sem.c index fce0bc8b5ad6..6013c751156f 100644 --- a/ipc/sem.c +++ b/ipc/sem.c @@ -66,7 +66,6 @@ * Dustin Kirkland <dustin.kirkland@us.ibm.com> */ -#include <linux/config.h> #include <linux/slab.h> #include <linux/spinlock.h> #include <linux/init.h> diff --git a/ipc/shm.c b/ipc/shm.c index fe7ae73b6981..940b0c9b13aa 100644 --- a/ipc/shm.c +++ b/ipc/shm.c @@ -17,7 +17,6 @@ * Dustin Kirkland <dustin.kirkland@us.ibm.com> */ -#include <linux/config.h> #include <linux/slab.h> #include <linux/mm.h> #include <linux/hugetlb.h> diff --git a/ipc/util.c b/ipc/util.c index 8193299f45f6..67b6d178db6e 100644 --- a/ipc/util.c +++ b/ipc/util.c @@ -14,7 +14,6 @@ * Dustin Kirkland <dustin.kirkland@us.ibm.com> */ -#include <linux/config.h> #include <linux/mm.h> #include <linux/shm.h> #include <linux/init.h> |