Merge branch 'devicetree/merge' into spi/merge
[pandora-kernel.git] / MAINTAINERS
diff --cc MAINTAINERS
Simple merge