Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core-2.6
[pandora-kernel.git] / MAINTAINERS
diff --cc MAINTAINERS
Simple merge