Merge git://git.infradead.org/mtd-2.6
[pandora-kernel.git] / MAINTAINERS
diff --cc MAINTAINERS
Simple merge