Merge branch 'x86-merge' into for-linus
authorJesse Barnes <jbarnes@virtuousgeek.org>
Tue, 19 Aug 2008 00:23:24 +0000 (17:23 -0700)
committerJesse Barnes <jbarnes@virtuousgeek.org>
Tue, 19 Aug 2008 00:23:24 +0000 (17:23 -0700)

Trivial merge