aboutsummaryrefslogtreecommitdiff
path: root/drivers
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2009-06-05 11:54:28 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2009-06-05 11:54:28 -0700
commit064e38aaded5269e573ac1c765284fd65c8ebd13 (patch)
treeefce870caf67069df9dd42d95a232a347bbbdb17 /drivers
parentcd24f8c1e7e27a2c6051a9a338d4704a2431dbf0 (diff)
parent44fb5511638938a2c37c895abc14df648ffc07e9 (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 oops and use after free during space balancing Btrfs: set device->total_disk_bytes when adding new device
Diffstat (limited to 'drivers')
0 files changed, 0 insertions, 0 deletions