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

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

155da8ff1710e596ccd664c88c18b3c7df9bb8fa