Merge branch 'linus' into tracing/core
[linux-2.6] / arch / microblaze / include / asm / cputable.h