From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Fri, 4 Nov 2011 02:16:54 +0000 (+1100)
Subject: Merge remote-tracking branch 'gfs2/master'
X-Git-Tag: next-20111104~53
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=4335dab2312dec976ced3fcd1c932e7c8aaa2138;p=karo-tx-linux.git

Merge remote-tracking branch 'gfs2/master'

Conflicts:
	fs/gfs2/file.c
---

4335dab2312dec976ced3fcd1c932e7c8aaa2138