| commit | 95f714727436836bb46236ce2bcd8ee8f9274aed | |
| author | Linus Torvalds <torvalds@linux-foundation.org> | |
| Tue, 24 Apr 2012 02:52:00 +0000 (23 19:52 -0700) | ||
| committer | Linus Torvalds <torvalds@linux-foundation.org> | |
| Tue, 24 Apr 2012 02:52:00 +0000 (23 19:52 -0700) | ||
| tree | 200ea790bf3299c9120b65b890ac85f56337d848 | treesnapshot (tar.gz zip) |
| parent | ce1ee9f5b99fa4ba332692194aa57b604112762f | commitdiff |
| parent | db7e5c668e1b16061fe2d94d3cba022dd360c5d4 | commitdiff |
Merge tag 'ext4_for_linus' of git://git./linux/kernel/git/tytso/ext4
Pull ext4 bug fixes from Ted Ts'o:
"These are two low-risk bug fixes for ext4, fixing a compile warning
and a potential deadlock."
* tag 'ext4_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4:
super.c: unused variable warning without CONFIG_QUOTA
jbd2: use GFP_NOFS for blkdev_issue_flush
Pull ext4 bug fixes from Ted Ts'o:
"These are two low-risk bug fixes for ext4, fixing a compile warning
and a potential deadlock."
* tag 'ext4_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4:
super.c: unused variable warning without CONFIG_QUOTA
jbd2: use GFP_NOFS for blkdev_issue_flush