]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 'logfs/master'
authorStephen Rothwell <sfr@canb.auug.org.au>
Fri, 18 Nov 2011 00:35:35 +0000 (11:35 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Fri, 18 Nov 2011 00:35:35 +0000 (11:35 +1100)
commitd3a2840d09ff8cd640cb97914e26730caf701fdf
treea5ffe6a4afb2af78e09687e5de39a8bee165ee48
parentc9a56284f9f9606cc86936574992d7f7463b157a
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