diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-08-12 01:01:06 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-08-12 01:01:06 +0200 |
| commit | dc8a7b11aa68d6795a46e0a42ce92220d1a6f0cd (patch) | |
| tree | 7b353684090d23b1e2e3f85bf83df491f04dcc8a /fs/ocfs2/ioctl.h | |
| parent | Merge git://git.kernel.org/pub/scm/linux/kernel/git/mingo/linux-2.6-sched (diff) | |
| parent | BLOCK: Hide the contents of linux/bio.h if CONFIG_BLOCK=n (diff) | |
| download | linux-dc8a7b11aa68d6795a46e0a42ce92220d1a6f0cd.tar.xz linux-dc8a7b11aa68d6795a46e0a42ce92220d1a6f0cd.zip | |
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: Hide the contents of linux/bio.h if CONFIG_BLOCK=n
sysace: HDIO_GETGEO has it's own method for ages
drivers/block/cpqarray.c: better error handling and kmalloc + memset conversion to k[cz]alloc
drivers/block/cciss.c: kmalloc + memset conversion to kzalloc
Clean up duplicate includes in drivers/block/
Fix remap handling by blktrace
[PATCH] remove mm/filemap.c:file_send_actor()
Diffstat (limited to 'fs/ocfs2/ioctl.h')
0 files changed, 0 insertions, 0 deletions