]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 'logfs/master'
authorStephen Rothwell <sfr@canb.auug.org.au>
Tue, 15 Nov 2011 23:21:21 +0000 (10:21 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Tue, 15 Nov 2011 23:21:21 +0000 (10:21 +1100)
commit21788f9f1c184a33678cb2e4dba15a6997b9991c
treea74b8f3ae47915f1ed8cb32f23a630aa308c1703
parent41bd0ff7b1dc46614753124036559a954e84ff84
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