]> git.baikalelectronics.ru Git - kernel.git/commit
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/btrfs...
authorLinus Torvalds <torvalds@linux-foundation.org>
Mon, 27 Jun 2011 20:32:14 +0000 (13:32 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Mon, 27 Jun 2011 20:32:14 +0000 (13:32 -0700)
commit9eaf7824d3873a1464a4b5d1552366f31d694dc9
tree564622df71c8b5666be24cbfd93f58516791d180
parenta0a422bbdb93f99f9fe238c1d97a2dd22a656fb3
parent3bc82dc7f220974ed99cde3424440f263a617f9e
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/btrfs-unstable

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/btrfs-unstable:
  btrfs: fix inconsonant inode information
  Btrfs: make sure to update total_bitmaps when freeing cache V3
  Btrfs: fix type mismatch in find_free_extent()
  Btrfs: make sure to record the transid in new inodes
fs/btrfs/inode.c