]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 'logfs/master'
authorStephen Rothwell <sfr@canb.auug.org.au>
Tue, 6 Dec 2011 00:03:00 +0000 (11:03 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Tue, 6 Dec 2011 00:03:00 +0000 (11:03 +1100)
commitb1137d1545be79e6993be57d861810264dc2c006
tree1375e5bbf144f1f4d8613dffed7044a787a14ca4
parent166d30e3bebed561f639e32b77170b1b963c4729
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