From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Wed, 12 Oct 2011 01:43:41 +0000 (+1100)
Subject: Merge remote-tracking branch 'xfs/master'
X-Git-Tag: next-20111012~77
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=39f969eb1f80657251fd1d0f6cfa879400000928;p=karo-tx-linux.git

Merge remote-tracking branch 'xfs/master'

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

39f969eb1f80657251fd1d0f6cfa879400000928