Merge commit 'v2.6.26' into x86/core
[pandora-kernel.git] / MAINTAINERS
diff --cc MAINTAINERS
Simple merge