From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Tue, 15 Nov 2011 23:29:56 +0000 (+1100)
Subject: Merge remote-tracking branch 'ocfs2/linux-next'
X-Git-Tag: next-20111116~53
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=a2a78986bf2455db5d18726c7184ff5390954dae;p=karo-tx-linux.git

Merge remote-tracking branch 'ocfs2/linux-next'

Conflicts:
	fs/ocfs2/xattr.c
---

a2a78986bf2455db5d18726c7184ff5390954dae