| commit | 5732c468495effd3089c1c893f3eba9a8a1d373c | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@linux-foundation.org> | Thu May 14 19:18:44 2009 -0700 |
| committer | Linus Torvalds <torvalds@linux-foundation.org> | Thu May 14 19:18:44 2009 -0700 |
| tree | 6cb79b79acde60efd82af296fd312569034d5a58 | |
| parent | 45d447406a19cbfd42720f066f156f4eb9d68801 [diff] | |
| parent | 9f55684c2d9869e8cc53595a3fee679958511cfb [diff] |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/mason/btrfs-unstable * git://git.kernel.org/pub/scm/linux/kernel/git/mason/btrfs-unstable: Btrfs: Spelling fix in btrfs_lookup_first_block_group comments Btrfs: make show_options result match actual option names Btrfs: remove outdated comment in btrfs_ioctl_resize() Btrfs: remove some WARN_ONs in the IO failure path Btrfs: Don't loop forever on metadata IO failures Btrfs: init inode ordered_data_close flag properly