Merge remote-tracking branch 'remotes/josef/for-chris' into btrfs-next-stable

This commit is contained in:
David Sterba 2011-10-24 14:47:57 +02:00
commit afd582ac8f
16 changed files with 1557 additions and 1058 deletions