diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-08-08 04:03:09 +0200 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-08-08 04:03:09 +0200 |
commit | d6a0967c90dced0a8baf502e6f3d5862fd5a5805 (patch) | |
tree | e0242d5077730dabc4102b7abad9ee0c41e33bc0 /kernel | |
parent | Merge git://git.kernel.org/pub/scm/linux/kernel/git/hch/xfs-icache-races (diff) | |
parent | Btrfs: fix balancing oops when invalidate_inode_pages2 returns EBUSY (diff) | |
download | linux-d6a0967c90dced0a8baf502e6f3d5862fd5a5805.tar.xz linux-d6a0967c90dced0a8baf502e6f3d5862fd5a5805.zip |
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 balancing oops when invalidate_inode_pages2 returns EBUSY
Btrfs: correct error-handling zlib error handling
Btrfs: remove superfluous NULL pointer check in btrfs_rename()
Btrfs: make sure the async caching thread advances the key
Btrfs: fix btrfs_remove_from_free_space corner case
Diffstat (limited to 'kernel')
0 files changed, 0 insertions, 0 deletions