]> git.baikalelectronics.ru Git - kernel.git/commit
projects / kernel.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: db247a2 f65f0cd)
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/btrfs...
authorLinus Torvalds <torvalds@linux-foundation.org>
Sat, 9 Jul 2011 06:25:45 +0000 (23:25 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Sat, 9 Jul 2011 06:25:45 +0000 (23:25 -0700)
commit26d07ef3e4c5c5390be4e26196d05e9d9136323b
tree255f346c01a33906b612852d5fb008da1f4520datree | snapshot
parentdb247a2a46f46e867c3e9ef6211974b0ecdffa15commit | diff
parentf65f0cd7ec8464416800458aa6dff13e2978e923commit | diff
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/btrfs-unstable

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/btrfs-unstable:
  btrfs: fix oops when doing space balance
  Btrfs: don't panic if we get an error while balancing V2
  btrfs: add missing options displayed in mount output
fs/btrfs/ctree.h diff1 | diff2 | blob | history
fs/btrfs/inode.c diff1 | diff2 | blob | history
fs/btrfs/super.c diff1 | diff2 | blob | history
Linux Kernel Source Tree.