diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2013-11-13 15:25:47 +0900 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2013-11-13 15:25:47 +0900 |
commit | a30124539b2641c5b3551193af7d21a6fc61ba98 (patch) | |
tree | a1c7f5e641b8f44b16f1b1d201870bb7f155e8d6 /arch/s390/lib/delay.c | |
parent | dd1d1399f2884102172f761816c32aa311bceafb (diff) | |
parent | 7ba3ec5749ddb61f79f7be17b5fd7720eebc52de (diff) | |
download | op-kernel-dev-a30124539b2641c5b3551193af7d21a6fc61ba98.zip op-kernel-dev-a30124539b2641c5b3551193af7d21a6fc61ba98.tar.gz |
Merge branch 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs
Pull ext[23], udf and quota fixes from Jan Kara:
"Assorted fixes in quota, ext2, ext3 & udf.
Probably the most important is a fix of fs corruption issue in ext2
XIP support (OTOH xip is rarely used)"
* 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs:
ext2: Fix fs corruption in ext2_get_xip_mem()
quota: info leak in quota_getquota()
jbd: Revert "jbd: remove dependency on __GFP_NOFAIL"
udf: fix for pathetic mount times in case of invalid file system
ext3: Count journal as bsddf overhead in ext3_statfs
Diffstat (limited to 'arch/s390/lib/delay.c')
0 files changed, 0 insertions, 0 deletions