Merge branches 'master', 'omap1-upstream' and 'orion' into devel
[linux-2.6] / include / asm-x86 / desc_64.h
1