]> git.karo-electronics.de Git - mv-sheeva.git/commit - arch/sh/include/asm/cacheflush.h
Merge git://git.kernel.org/pub/scm/linux/kernel/git/mason/btrfs-unstable
authorLinus Torvalds <torvalds@linux-foundation.org>
Sun, 13 Mar 2011 23:00:49 +0000 (16:00 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Sun, 13 Mar 2011 23:00:49 +0000 (16:00 -0700)
commit0e5b88cd9975dca6c191cc9bd11f233fac4ca882
tree6302317acfb24d6b5ad7924aceaa0dd1c4a7a371
parenteebea5d13d391981061d6ef069a841002eba4a7a
parent36e39c40b3facc9b489a13f1d301fc53ff6960a3
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
fs/btrfs/ctree.h
fs/btrfs/extent-tree.c
fs/btrfs/extent_io.c
fs/btrfs/file.c
fs/btrfs/inode.c