]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 'logfs/master'
authorStephen Rothwell <sfr@canb.auug.org.au>
Wed, 7 Dec 2011 00:36:21 +0000 (11:36 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Wed, 7 Dec 2011 00:36:21 +0000 (11:36 +1100)
commit2f6df89b2a11d51948106355e750251db68c4eeb
tree051b64582ff4d9c019af99a2ce77b0641bb7ecbd
parent155da8ff1710e596ccd664c88c18b3c7df9bb8fa
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