From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Fri, 29 Jul 2011 02:25:14 +0000 (+1000)
Subject: Merge remote-tracking branch 'logfs/master'
X-Git-Tag: next-20110729~60
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=142a9b4849bb3978644477d6c3207fc951ba55b7;p=karo-tx-linux.git

Merge remote-tracking branch 'logfs/master'

Conflicts:
	fs/logfs/logfs.h
---

142a9b4849bb3978644477d6c3207fc951ba55b7