]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 'logfs/master'
authorStephen Rothwell <sfr@canb.auug.org.au>
Tue, 13 Dec 2011 01:26:27 +0000 (12:26 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Tue, 13 Dec 2011 01:26:27 +0000 (12:26 +1100)
commit51778ba752a4ac5b55d68f897f966a18c22058fb
tree9668df79404493559cbe9c5f777792ae64c4e1d3
parent1281d9ad41a7f14009fba1a93eafb7ab592acff0
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