diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-11-11 11:28:11 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-11-11 11:28:11 -0800 |
| commit | 16fe4101ae265e908615702806ee3b28ab1c8370 (patch) | |
| tree | da2a562d5a3566a659c33be2d2744478fc994d7c /drivers/net | |
| parent | 7bbf8ef6902d1e0102a91d22c035622443fd20ca (diff) | |
| parent | 1e424a348303694fabdf8b1efbfcb1a892dfa63a (diff) | |
Merge branch 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4
* 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4:
ext4: partial revert to fix double brelse WARNING()
ext4: Fix return value of ext4_split_unwritten_extents() to fix direct I/O
ext4: code clean up for dio fallocate handling
ext4: skip conversion of uninit extents after direct IO if there isn't any
ext4: fix ext4_ext_direct_IO()'s return value after converting uninit extents
ext4: discard preallocation when restarting a transaction during truncate
Diffstat (limited to 'drivers/net')
0 files changed, 0 insertions, 0 deletions