git.openpandora.org / pandora-kernel.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 45d4474 9f55684)
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)
* 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

1  2 
fs/btrfs/ioctl.c patch | diff1 | diff2 | blob | history
fs/btrfs/super.c patch | diff1 | diff2 | blob | history

diff --cc fs/btrfs/ioctl.c
Simple merge
diff --cc fs/btrfs/super.c
Simple merge
Pandora Kernel Repository