summaryrefslogtreecommitdiff
path: root/drivers
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2011-03-18 22:33:38 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2011-03-18 22:33:38 -0700
commit5bab188a316718a26346cdb25c4cc6b319f8f907 (patch)
tree0316a8294b9709a55b0c5b2f1c1c0d3793d35c01 /drivers
parenta8c91da549f625d0600d5bd7e1831066b55edf0d (diff)
parent4d3cf1bc557dc8b88e1cabf1980b3baa3380a641 (diff)
downloadlinux-3.10-5bab188a316718a26346cdb25c4cc6b319f8f907.tar.gz
linux-3.10-5bab188a316718a26346cdb25c4cc6b319f8f907.tar.bz2
linux-3.10-5bab188a316718a26346cdb25c4cc6b319f8f907.zip
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ryusuke/nilfs2
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ryusuke/nilfs2: nilfs2: move NILFS_SUPER_MAGIC to linux/magic.h nilfs2: get rid of nilfs_sb_info structure nilfs2: use sb instance instead of nilfs_sb_info struct nilfs2: get rid of sc_sbi back pointer nilfs2: move log writer onto nilfs object nilfs2: move next generation counter into nilfs object nilfs2: move s_inode_lock and s_dirty_files into nilfs object nilfs2: move parameters on nilfs_sb_info into nilfs object nilfs2: move mount options to nilfs object nilfs2: record used amount of each checkpoint in checkpoint list nilfs2: optimize rec_len functions nilfs2: append blocksize info to warnings during loading super blocks nilfs2: add compat ioctl nilfs2: implement FS_IOC_GETFLAGS/SETFLAGS/GETVERSION nilfs2: tighten restrictions on inode flags nilfs2: mark S_NOATIME on inodes only if NOATIME attribute is set nilfs2: use common file attribute macros nilfs2: add free entries count only if clear bit operation succeeded nilfs2: decrement inodes count only if raw inode was successfully deleted
Diffstat (limited to 'drivers')
0 files changed, 0 insertions, 0 deletions