From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Tue, 11 Oct 2011 03:03:51 +0000 (+1100)
Subject: Merge remote-tracking branch 'xfs/master'
X-Git-Tag: next-20111011~77
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=2a50c5630db85d5a88e4aa57ce6f16fcbd9cefa5;p=karo-tx-linux.git

Merge remote-tracking branch 'xfs/master'

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

2a50c5630db85d5a88e4aa57ce6f16fcbd9cefa5