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