From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Tue, 22 Nov 2011 02:33:53 +0000 (+1100)
Subject: Merge remote-tracking branch 'ocfs2/linux-next'
X-Git-Tag: next-20111122~57
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=42cf59e14fdf40403fb1fa2a6e8a6a0b3dfda6e8;p=karo-tx-linux.git

Merge remote-tracking branch 'ocfs2/linux-next'
---

42cf59e14fdf40403fb1fa2a6e8a6a0b3dfda6e8