Merge branch 'for-linus' into raid56-experimental

Conflicts:
	fs/btrfs/volumes.c

Signed-off-by: Chris Mason <chris.mason@fusionio.com>
This commit is contained in:
Chris Mason 2013-02-05 10:04:03 -05:00
commit 0e4e026366
14 changed files with 300 additions and 98 deletions