Merge branch 'master' into for-linus
[pandora-kernel.git] / arch / mn10300 / include / asm / topology.h