From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Tue, 1 Nov 2011 03:12:44 +0000 (+1100)
Subject: Merge remote-tracking branch 'ocfs2/linux-next'
X-Git-Tag: next-20111101~60
X-Git-Url: https://git.kernelconcepts.de/?a=commitdiff_plain;h=a67b510585d12a7eb682e1a7e69cab94acbdd2f2;p=karo-tx-linux.git

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

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

a67b510585d12a7eb682e1a7e69cab94acbdd2f2