From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Wed, 21 Dec 2011 00:03:08 +0000 (+1100)
Subject: Merge remote-tracking branch 'gfs2/master'
X-Git-Tag: next-20111221~79
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=cc700d1a792a7203079bab1c3b9a28a9644dd2bf;p=karo-tx-linux.git

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

cc700d1a792a7203079bab1c3b9a28a9644dd2bf