From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Fri, 9 Sep 2011 02:47:37 +0000 (+1000)
Subject: Merge remote-tracking branch 'xfs/master'
X-Git-Tag: next-20110909~71
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=170ead09f68b6198db163d43efa38892c98c24cf;p=karo-tx-linux.git

Merge remote-tracking branch 'xfs/master'

Conflicts:
	fs/xfs/xfs_super.c
---

170ead09f68b6198db163d43efa38892c98c24cf