]> git.baikalelectronics.ru Git - kernel.git/commit
Merge git://git.kernel.org/pub/scm/linux/kernel/git/mason/btrfs-unstable
authorLinus Torvalds <torvalds@linux-foundation.org>
Fri, 15 May 2009 02:18:44 +0000 (19:18 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Fri, 15 May 2009 02:18:44 +0000 (19:18 -0700)
commit7486c77a6f8934ae6259a2cce7dbad565e4bfb00
tree6cb79b79acde60efd82af296fd312569034d5a58
parent7a81e6e8c5bb5ee284978b450079e1ff791ca96b
parentb30d1b06e8c0f15d85a32ff465aab6d5086f9428
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
fs/btrfs/ioctl.c
fs/btrfs/super.c