From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Thu, 3 Nov 2011 03:05:24 +0000 (+1100)
Subject: Merge remote-tracking branch 'ocfs2/linux-next'
X-Git-Tag: next-20111103~52
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=365a5dc902507e07e91315c0a1c8585c8044f490;p=karo-tx-linux.git

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

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

365a5dc902507e07e91315c0a1c8585c8044f490