From: Al Viro <viro@zeniv.linux.org.uk>
Date: Fri, 21 Aug 2015 06:31:20 +0000 (-0400)
Subject: Merge branch 'superblock-scaling' of git://git.kernel.org/pub/scm/linux/kernel/git... 
X-Git-Tag: omap-for-v4.3/fixes-rc1~80^2~4
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=061f98e959ea025a5d87c3e089d59ec2ec5f5d6d;p=pandora-kernel.git

Merge branch 'superblock-scaling' of git://git./linux/kernel/git/josef/btrfs-next into for-next

Conflicts:
	include/linux/fs.h
---

061f98e959ea025a5d87c3e089d59ec2ec5f5d6d
Reading git-diff-tree failed