Merge git://git.kernel.org/pub/scm/linux/kernel/git/x86/linux-2.6-x86
authorLinus Torvalds <[email protected]>
Tue, 1 Jan 2008 19:33:00 +0000 (11:33 -0800)
committerLinus Torvalds <[email protected]>
Tue, 1 Jan 2008 19:33:00 +0000 (11:33 -0800)
* git://git.kernel.org/pub/scm/linux/kernel/git/x86/linux-2.6-x86:
  x86: fix asm-x86/msr.h for user-space export
  x86: fix asm-x86/byteorder.h for userspace export


Trivial merge