projects / openwrt / staging / blogic.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 4699d44 2f7e33d)
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)
commitaf4087e0e682df12bdffec5cfafc2fec9208716e
tree564622df71c8b5666be24cbfd93f58516791d180tree | snapshot
parent4699d4423c07a1db35ea9453eac3a07e818338f9commit | diff
parent2f7e33d432d097a2a7f467b031bf18be91cb3d49commit | diff
Merge branch 'for-linus' of git://git./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 diff1 | diff2 | blob | history
John Crispins staging tree