diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2013-11-14 09:19:58 +0100 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2013-11-14 09:19:58 +0100 |
commit | 4fbf888accb39af423f271111d44e8186f053723 (patch) | |
tree | 4af3dae51450c38009df593ddef04deee2883673 /drivers/pci/proc.c | |
parent | Merge tag 'xfs-for-linus-v3.13-rc1' of git://oss.sgi.com/xfs/xfs (diff) | |
parent | ext4: add prototypes for macro-generated functions (diff) | |
download | linux-4fbf888accb39af423f271111d44e8186f053723.tar.xz linux-4fbf888accb39af423f271111d44e8186f053723.zip |
Merge tag 'ext4_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4
Pull ext4 changes from Ted Ts'o:
"Ext4 updates for 3.13. Mostly bug fixes and cleanups"
* tag 'ext4_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4:
ext4: add prototypes for macro-generated functions
ext4: return non-zero st_blocks for inline data
ext4: use prandom_u32() instead of get_random_bytes()
ext4: remove unreachable code after ext4_can_extents_be_merged()
ext4: remove unreachable code in ext4_can_extents_be_merged()
ext4: avoid bh leak in retry path of ext4_expand_extra_isize_ea()
ext4: don't count free clusters from a corrupt block group
ext4: fix FITRIM in no journal mode
ext4: drop set but otherwise unused variable from ext4_add_dirent_to_inline()
ext4: change ext4_read_inline_dir() to return 0 on success
ext4: pair trace_ext4_writepages & trace_ext4_writepages_result
ext4: add ratelimiting to ext4 messages
ext4: fix performance regression in ext4_writepages
ext4: fixup kerndoc annotation of mpage_map_and_submit_extent()
ext4: fix assertion in ext4_add_complete_io()
Diffstat (limited to 'drivers/pci/proc.c')
0 files changed, 0 insertions, 0 deletions