summaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2011-03-14 00:00:49 +0100
committerLinus Torvalds <torvalds@linux-foundation.org>2011-03-14 00:00:49 +0100
commit0e5b88cd9975dca6c191cc9bd11f233fac4ca882 (patch)
tree6302317acfb24d6b5ad7924aceaa0dd1c4a7a371 /drivers
parentMerge git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-rc-fixes-2.6 (diff)
parentBtrfs: break out of shrink_delalloc earlier (diff)
downloadlinux-0e5b88cd9975dca6c191cc9bd11f233fac4ca882.tar.xz
linux-0e5b88cd9975dca6c191cc9bd11f233fac4ca882.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: break out of shrink_delalloc earlier btrfs: fix not enough reserved space btrfs: fix dip leak Btrfs: make sure not to return overlapping extents to fiemap Btrfs: deal with short returns from copy_from_user Btrfs: fix regressions in copy_from_user handling
Diffstat (limited to 'drivers')
0 files changed, 0 insertions, 0 deletions