From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Fri, 15 May 2009 02:18:44 +0000 (-0700)
Subject: Merge git://git.kernel.org/pub/scm/linux/kernel/git/mason/btrfs-unstable
X-Git-Tag: v3.0~9224
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=5732c468495effd3089c1c893f3eba9a8a1d373c;p=platform%2Fkernel%2Flinux-amlogic.git

Merge git://git./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
---

5732c468495effd3089c1c893f3eba9a8a1d373c