Merge branch 'x86/urgent' into x86/xen
[linux-2.6] / arch / microblaze / include / asm / user.h
1