]> 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>
Tue, 16 Feb 2010 03:56:21 +0000 (19:56 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Tue, 16 Feb 2010 03:56:21 +0000 (19:56 -0800)
commit6fba9e49cc1a2deadd56565791199bcd58cda8ff
tree4d2b1a9717e6cdbab7966ce2d0ae698a52d46ae0
parent42f030de3842946e116c2391df56626219ff23c2
parent077ca55efd0cc9b1fda92dc6a89910c158fc5444
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: btrfs_mark_extent_written uses the wrong slot
fs/btrfs/file.c