Merge commit 'origin/master' into adv
authorH. Peter Anvin <hpa@zytor.com>
Thu, 10 Jan 2008 03:07:30 +0000 (19:07 -0800)
committerH. Peter Anvin <hpa@zytor.com>
Thu, 10 Jan 2008 03:07:30 +0000 (19:07 -0800)
commit1febc7936ec9c3f139d6ed993d4ec13b63c81f80
tree2f974290cedb1337f1fadd03794bc0bd09968d78
parentf87662aa975e26d876920846244b202fb3a165e5
parentaa850da5d3b9b8e0fedbe03e635503d4b8eecfa4
Merge commit 'origin/master' into adv