Merge branch 'linux_next' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab...
[pandora-kernel.git] / MAINTAINERS
diff --cc MAINTAINERS
Simple merge