Merge branch 'for-linus' of git://oss.sgi.com:8090/xfs/xfs-2.6
[cascardo/linux.git] / include / asm-x86 / desc_64.h
1