Merge branch 'for-linus' of git://www.jni.nu/cris
[pandora-kernel.git] / .mailmap