]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 'logfs/master'
authorStephen Rothwell <sfr@canb.auug.org.au>
Mon, 12 Dec 2011 00:21:01 +0000 (11:21 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Mon, 12 Dec 2011 00:21:01 +0000 (11:21 +1100)
commit10425006f51b31e67ffb0642827ea02b010b806a
treed8fd7170f2a785a597a9c64f735ed9f550f97015
parent164960a1bc914e0c565465445fcaef7bf5913750
parent21f3eb832ba8902a29746a602015410b0b471622
Merge remote-tracking branch 'logfs/master'

Conflicts:
fs/logfs/file.c
MAINTAINERS
fs/logfs/dir.c
fs/logfs/file.c
fs/logfs/inode.c
fs/logfs/logfs.h
fs/logfs/readwrite.c
fs/logfs/super.c