From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Fri, 20 Dec 2013 00:28:28 +0000 (+1100)
Subject: Merge remote-tracking branch 'gfs2/master'
X-Git-Tag: next-20131220~80
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=f1247e7a18bdaa7094e9d2050ceceac9fa47b0c5;p=karo-tx-linux.git

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

f1247e7a18bdaa7094e9d2050ceceac9fa47b0c5