diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-06-30 15:39:30 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-06-30 15:39:30 -0700 |
| commit | 22a3e233ca08a2ddc949ba1ae8f6e16ec7ef1a13 (patch) | |
| tree | 7ef158ba2c30e0dde2dc103d1904fae243759a6b /block | |
| parent | 39302175c26d74be35715c05a0f342c9e64c21bf (diff) | |
| parent | 6ab3d5624e172c553004ecc862bfeac16d9d68b7 (diff) | |
| download | linux-3.10-22a3e233ca08a2ddc949ba1ae8f6e16ec7ef1a13.tar.gz linux-3.10-22a3e233ca08a2ddc949ba1ae8f6e16ec7ef1a13.tar.bz2 linux-3.10-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 'block')
| -rw-r--r-- | block/as-iosched.c | 1 | ||||
| -rw-r--r-- | block/blktrace.c | 1 | ||||
| -rw-r--r-- | block/cfq-iosched.c | 1 | ||||
| -rw-r--r-- | block/deadline-iosched.c | 1 | ||||
| -rw-r--r-- | block/elevator.c | 1 | ||||
| -rw-r--r-- | block/genhd.c | 1 | ||||
| -rw-r--r-- | block/ll_rw_blk.c | 1 |
7 files changed, 0 insertions, 7 deletions
diff --git a/block/as-iosched.c b/block/as-iosched.c index 3af31ed49a9..5da56d48fbd 100644 --- a/block/as-iosched.c +++ b/block/as-iosched.c @@ -10,7 +10,6 @@ #include <linux/blkdev.h> #include <linux/elevator.h> #include <linux/bio.h> -#include <linux/config.h> #include <linux/module.h> #include <linux/slab.h> #include <linux/init.h> diff --git a/block/blktrace.c b/block/blktrace.c index 36f3a172275..92925e7d9e6 100644 --- a/block/blktrace.c +++ b/block/blktrace.c @@ -15,7 +15,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA * */ -#include <linux/config.h> #include <linux/kernel.h> #include <linux/blkdev.h> #include <linux/blktrace_api.h> diff --git a/block/cfq-iosched.c b/block/cfq-iosched.c index e25223e147a..102ebc2c5c3 100644 --- a/block/cfq-iosched.c +++ b/block/cfq-iosched.c @@ -6,7 +6,6 @@ * * Copyright (C) 2003 Jens Axboe <axboe@suse.de> */ -#include <linux/config.h> #include <linux/module.h> #include <linux/blkdev.h> #include <linux/elevator.h> diff --git a/block/deadline-iosched.c b/block/deadline-iosched.c index 4469dd84623..c7ca9f0b649 100644 --- a/block/deadline-iosched.c +++ b/block/deadline-iosched.c @@ -8,7 +8,6 @@ #include <linux/blkdev.h> #include <linux/elevator.h> #include <linux/bio.h> -#include <linux/config.h> #include <linux/module.h> #include <linux/slab.h> #include <linux/init.h> diff --git a/block/elevator.c b/block/elevator.c index d00b283f31d..bc7baeec0d1 100644 --- a/block/elevator.c +++ b/block/elevator.c @@ -27,7 +27,6 @@ #include <linux/blkdev.h> #include <linux/elevator.h> #include <linux/bio.h> -#include <linux/config.h> #include <linux/module.h> #include <linux/slab.h> #include <linux/init.h> diff --git a/block/genhd.c b/block/genhd.c index 8d7339511e5..25d1f42568c 100644 --- a/block/genhd.c +++ b/block/genhd.c @@ -2,7 +2,6 @@ * gendisk handling */ -#include <linux/config.h> #include <linux/module.h> #include <linux/fs.h> #include <linux/genhd.h> diff --git a/block/ll_rw_blk.c b/block/ll_rw_blk.c index fb83547f563..5813d63c20a 100644 --- a/block/ll_rw_blk.c +++ b/block/ll_rw_blk.c @@ -10,7 +10,6 @@ /* * This handles all read/write requests to block devices */ -#include <linux/config.h> #include <linux/kernel.h> #include <linux/module.h> #include <linux/backing-dev.h> |