]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 'logfs/master'
authorStephen Rothwell <sfr@canb.auug.org.au>
Tue, 22 Nov 2011 23:36:13 +0000 (10:36 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Tue, 22 Nov 2011 23:36:13 +0000 (10:36 +1100)
commit766bc6ecc50c0723276044358c9d0b4d17519e96
treecd840b12be87ec7e0ff5b5c545bf6594d62c15c0
parent4ef367b493bdf0306e46459050c507e38b09d7dd
parent011a85aca1c0e56b344df6be77401b837e721fd9
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