]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 'logfs/master'
authorStephen Rothwell <sfr@canb.auug.org.au>
Wed, 9 Nov 2011 00:25:59 +0000 (11:25 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Wed, 9 Nov 2011 00:25:59 +0000 (11:25 +1100)
commit968cee6d44c67d60480e1b3289055d65fa6816dd
treec1a642a032c66f7344795b06cb9eefdd546b429a
parentdb7c297bb424ec3250f53d3f8d38681af6b1fc05
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