From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Tue, 4 Oct 2011 01:23:21 +0000 (+1100)
Subject: Merge remote-tracking branch 'xfs/master'
X-Git-Tag: next-20111004~75
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=4dcd8917ad0ff6f97245a5003383a7621613addf;p=karo-tx-linux.git

Merge remote-tracking branch 'xfs/master'

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

4dcd8917ad0ff6f97245a5003383a7621613addf