From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Fri, 30 Sep 2011 00:56:57 +0000 (+1000)
Subject: Merge remote-tracking branch 'xfs/master'
X-Git-Tag: next-20110930~75
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=f1dfa474001556dcd949434d7d696fead04eb519;p=karo-tx-linux.git

Merge remote-tracking branch 'xfs/master'

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

f1dfa474001556dcd949434d7d696fead04eb519