]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 'logfs/master'
authorStephen Rothwell <sfr@canb.auug.org.au>
Thu, 17 Nov 2011 00:26:56 +0000 (11:26 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Thu, 17 Nov 2011 00:26:56 +0000 (11:26 +1100)
commit5155d079a1df95f09760cdcb416236efc388b525
tree31bffcf8b9785af08bd91e51c4321f7a0323d9ba
parent742b8c9e8157dfac7231a551ce383375c9c298ee
parent51b3089b6a98a53b2f83a9c9c054fcb4a7020522
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