Merge branch 'master' of git://git.infradead.org/users/dedekind/ubifs-v2.6.27 into...
authorGrazvydas Ignotas <notasas@gmail.com>
Fri, 7 May 2010 13:58:24 +0000 (16:58 +0300)
committerGrazvydas Ignotas <notasas@gmail.com>
Fri, 7 May 2010 13:58:24 +0000 (16:58 +0300)
1  2 
MAINTAINERS
drivers/mtd/ubi/cdev.c
fs/ubifs/file.c

diff --cc MAINTAINERS
Simple merge
Simple merge
diff --cc fs/ubifs/file.c
Simple merge