tree d3d916dbf11a317e6fdc37f5852a529f938d27b9
parent 77717d27c2224e1c3eec31da90272d14e8c7045c
parent 56986d4210e5077d67e4eff538a316a6cc4e5158
author Linus Torvalds <torvalds@woody.linux-foundation.org> 1199215980 -0800
committer Linus Torvalds <torvalds@woody.linux-foundation.org> 1199215980 -0800

Merge git://git.kernel.org/pub/scm/linux/kernel/git/x86/linux-2.6-x86

* 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