git.openpandora.org / pandora-kernel.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: c2d197e 149e2d7)
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)
* '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


Trivial merge
Pandora Kernel Repository