]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 'logfs/master'
authorStephen Rothwell <sfr@canb.auug.org.au>
Mon, 5 Dec 2011 00:34:57 +0000 (11:34 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Mon, 5 Dec 2011 00:34:57 +0000 (11:34 +1100)
commit92b5be9cbb51feb15655cf54494d9a64ec8a53c2
tree3f0ec38de420e56c65866e839a1c30b0ab72c561
parenta5736483bae61165edbdac4ae16ec504b4b8214b
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