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

Merge remote-tracking branch 'gfs2/master'

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

638ee766dbdfec5d32e11837a585095138c5305a