| commit | 30a0f5e1fb510f17c25ff159a9fffbe01ae0f34e | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@linux-foundation.org> | Thu Jan 21 07:28:05 2010 -0800 |
| committer | Linus Torvalds <torvalds@linux-foundation.org> | Thu Jan 21 07:28:05 2010 -0800 |
| tree | 3392e115d4d5767c8bdaeac8696a2465d65a1e91 | |
| parent | 88f5004430babb836cfce886d5d54c82166f8ba4 [diff] | |
| parent | 11dfe35a0108097f2df1f042c485fa7f758c2cdf [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)