projects / openwrt / staging / blogic.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 958ede7 ec29ed5)
Merge git://git.kernel.org/pub/scm/linux/kernel/git/mason/btrfs-unstable
authorLinus Torvalds <torvalds@linux-foundation.org>
Fri, 25 Feb 2011 22:03:39 +0000 (14:03 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Fri, 25 Feb 2011 22:03:39 +0000 (14:03 -0800)
commit4660ba63f1c4e07c20a435e084f12ba48a82bd2b
tree494973a1dd4102eede20298f478574801af31b86tree | snapshot
parent958ede7f1b72b29cd0d29ec88ee2bcb4c87dab61commit | diff
parentec29ed5b407d618a8128f5942aade9e1758aa14bcommit | diff
Merge git://git./linux/kernel/git/mason/btrfs-unstable

* git://git.kernel.org/pub/scm/linux/kernel/git/mason/btrfs-unstable:
  Btrfs: fix fiemap bugs with delalloc
  Btrfs: set FMODE_EXCL in btrfs_device->mode
  Btrfs: make btrfs_rm_device() fail gracefully
  Btrfs: Avoid accessing unmapped kernel address
  Btrfs: Fix BTRFS_IOC_SUBVOL_SETFLAGS ioctl
  Btrfs: allow balance to explicitly allocate chunks as it relocates
  Btrfs: put ENOSPC debugging under a mount option
fs/btrfs/ctree.h diff1 | diff2 | blob | history
fs/btrfs/extent-tree.c diff1 | diff2 | blob | history
fs/btrfs/extent_io.c diff1 | diff2 | blob | history
fs/btrfs/inode.c diff1 | diff2 | blob | history
fs/btrfs/super.c diff1 | diff2 | blob | history
fs/btrfs/volumes.c diff1 | diff2 | blob | history
John Crispins staging tree