]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 'logfs/master'
authorStephen Rothwell <sfr@canb.auug.org.au>
Fri, 9 Dec 2011 01:40:35 +0000 (12:40 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Fri, 9 Dec 2011 01:40:35 +0000 (12:40 +1100)
commitcddcb32f9926b394cbcf5445ac9a8b3c6a66334e
tree1bf29993b93d5e81de4dfd70c751ee550ba0373d
parent791ed3c19e5f546cbf3a43b674c98e15b6c966b7
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