]> git.ipfire.org Git - people/ms/linux.git/commit
projects / people / ms / linux.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 88f5004 11dfe35)
Merge git://git.kernel.org/pub/scm/linux/kernel/git/mason/btrfs-unstable
authorLinus Torvalds <torvalds@linux-foundation.org>
Thu, 21 Jan 2010 15:28:05 +0000 (07:28 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Thu, 21 Jan 2010 15:28:05 +0000 (07:28 -0800)
commit30a0f5e1fb510f17c25ff159a9fffbe01ae0f34e
tree3392e115d4d5767c8bdaeac8696a2465d65a1e91tree | snapshot
parent88f5004430babb836cfce886d5d54c82166f8ba4commit | diff
parent11dfe35a0108097f2df1f042c485fa7f758c2cdfcommit | diff
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: fix possible panic on unmount
  Btrfs: deal with NULL acl sent to btrfs_set_acl
  Btrfs: fix regression in orphan cleanup
  Btrfs: Fix race in btrfs_mark_extent_written
  Btrfs, fix memory leaks in error paths
  Btrfs: align offsets for btrfs_ordered_update_i_size
  btrfs: fix missing last-entry in readdir(3)
fs/btrfs/acl.c diff1 | diff2 | blob | history
fs/btrfs/file.c diff1 | diff2 | blob | history
Michael's Linux tree.