From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Tue, 24 Jul 2012 23:55:58 +0000 (+1000)
Subject: Merge remote-tracking branch 'gfs2/master'
X-Git-Tag: next-20120725~83
X-Git-Url: https://git.kernelconcepts.de/?a=commitdiff_plain;h=b6b6e876ccf9a6f226a8413c1711e04ffc54d5d8;p=karo-tx-linux.git

Merge remote-tracking branch 'gfs2/master'
---

b6b6e876ccf9a6f226a8413c1711e04ffc54d5d8