Merge branch 'master' into for-next
[pandora-kernel.git] / MAINTAINERS
diff --cc MAINTAINERS
Simple merge