| commit | 064e38aaded5269e573ac1c765284fd65c8ebd13 | |
| author | Linus Torvalds <torvalds@linux-foundation.org> | |
| Fri, 5 Jun 2009 18:54:28 +0000 (5 11:54 -0700) | ||
| committer | Linus Torvalds <torvalds@linux-foundation.org> | |
| Fri, 5 Jun 2009 18:54:28 +0000 (5 11:54 -0700) | ||
| tree | efce870caf67069df9dd42d95a232a347bbbdb17 | treesnapshot (tar.gz zip) |
| parent | cd24f8c1e7e27a2c6051a9a338d4704a2431dbf0 | commitdiff |
| parent | 44fb5511638938a2c37c895abc14df648ffc07e9 | commitdiff |
Merge git://git./linux/kernel/git/mason/btrfs-unstable
* git://git.kernel.org/pub/scm/linux/kernel/git/mason/btrfs-unstable:
Btrfs: Fix oops and use after free during space balancing
Btrfs: set device->total_disk_bytes when adding new device
* git://git.kernel.org/pub/scm/linux/kernel/git/mason/btrfs-unstable:
Btrfs: Fix oops and use after free during space balancing
Btrfs: set device->total_disk_bytes when adding new device