From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Fri, 7 Oct 2011 00:59:49 +0000 (+1100)
Subject: Merge remote-tracking branch 'xfs/master'
X-Git-Tag: next-20111007~77
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=8bc90d3049539dfc1fce34c3955709ec8d10351b;p=karo-tx-linux.git

Merge remote-tracking branch 'xfs/master'

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

8bc90d3049539dfc1fce34c3955709ec8d10351b