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)
commit0813e22d4e0d618eac9b47bec942bf856adca4c5
tree4d2b1a9717e6cdbab7966ce2d0ae698a52d46ae0
parent382640b3372405c40b7646c68a50ca91358027e4
parent3f6fae9559225741c91f1320090b285da1413290
Merge git://git./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