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)
commit2f27532760a4d2b984ed4263afc558dd1f3185dc
treec9822310c9e4f9f27313025caf9b22af0a66e78b
parent3a6c2f8305acbad93fb5c527abb1872f365caddf
parent56cfb0dbfe852bccf72f2624b7c4665e8f28affe
Merge branch 'master' of git://git.infradead.org/users/dedekind/ubifs-v2.6.27 into pandora-27-omap1_rework
MAINTAINERS
drivers/mtd/ubi/cdev.c
fs/ubifs/file.c