diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-06-16 18:46:45 (GMT) |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-06-16 18:46:45 (GMT) |
| commit | d613839ef987d20f7c9347732b452efd921b97d9 (patch) | |
| tree | 5998f460596d8dca129d0f116add8f9abddfad38 /mm | |
| parent | 609106b9ac968adbc76ce78c979fc3903a56e16c (diff) | |
| parent | e212d6f25084e8e9b02a04ba514d7bb1e4a4924a (diff) | |
| download | linux-fsl-qoriq-d613839ef987d20f7c9347732b452efd921b97d9.tar.xz | |
Merge branch 'for-linus' of git://git.kernel.dk/linux-2.6-block
* 'for-linus' of git://git.kernel.dk/linux-2.6-block:
block: remove some includings of blktrace_api.h
mg_disk: seperate mg_disk.h again
block: Introduce helper to reset queue limits to default values
cfq: remove extraneous '\n' in blktrace output
ubifs: register backing_dev_info
btrfs: properly register fs backing device
block: don't overwrite bdi->state after bdi_init() has been run
cfq: cleanup for last_end_request in cfq_data
Diffstat (limited to 'mm')
| -rw-r--r-- | mm/bounce.c | 1 | ||||
| -rw-r--r-- | mm/highmem.c | 1 |
2 files changed, 0 insertions, 2 deletions
diff --git a/mm/bounce.c b/mm/bounce.c index 4ebe3ea..a2b76a5 100644 --- a/mm/bounce.c +++ b/mm/bounce.c @@ -13,7 +13,6 @@ #include <linux/init.h> #include <linux/hash.h> #include <linux/highmem.h> -#include <linux/blktrace_api.h> #include <asm/tlbflush.h> #include <trace/events/block.h> diff --git a/mm/highmem.c b/mm/highmem.c index 68eb1d9..25878cc 100644 --- a/mm/highmem.c +++ b/mm/highmem.c @@ -26,7 +26,6 @@ #include <linux/init.h> #include <linux/hash.h> #include <linux/highmem.h> -#include <linux/blktrace_api.h> #include <asm/tlbflush.h> /* |