diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-01-07 17:16:27 -0800 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-01-07 17:16:27 -0800 |
commit | 0c21e3aaf6ae85bee804a325aa29c325209180fd (patch) | |
tree | 81c5d698e1c40cc8f473b21c5587a34598754a64 /net/netfilter/core.c | |
parent | 021db8e2bde53024a163fb4417a185de46fe77aa (diff) | |
parent | b2837fcf4994e699a4def002e26f274d95b387c1 (diff) | |
download | op-kernel-dev-0c21e3aaf6ae85bee804a325aa29c325209180fd.zip op-kernel-dev-0c21e3aaf6ae85bee804a325aa29c325209180fd.tar.gz |
Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/hch/hfsplus
* 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/hch/hfsplus:
hfsplus: %L-to-%ll, macro correction, and remove unneeded braces
hfsplus: spaces/indentation clean-up
hfsplus: C99 comments clean-up
hfsplus: over 80 character lines clean-up
hfsplus: fix an artifact in ioctl flag checking
hfsplus: flush disk caches in sync and fsync
hfsplus: optimize fsync
hfsplus: split up inode flags
hfsplus: write up fsync for directories
hfsplus: simplify fsync
hfsplus: avoid useless work in hfsplus_sync_fs
hfsplus: make sure sync writes out all metadata
hfsplus: use raw bio access for partition tables
hfsplus: use raw bio access for the volume headers
hfsplus: always use hfsplus_sync_fs to write the volume header
hfsplus: silence a few debug printks
hfsplus: fix option parsing during remount
Fix up conflicts due to VFS changes in fs/hfsplus/{hfsplus_fs.h,unicode.c}
Diffstat (limited to 'net/netfilter/core.c')
0 files changed, 0 insertions, 0 deletions