Merge git://git.kernel.org/pub/scm/linux/kernel/git/x86/linux-2.6-x86
authorLinus Torvalds <torvalds@woody.linux-foundation.org>
Tue, 1 Jan 2008 19:33:00 +0000 (11:33 -0800)
committerLinus Torvalds <torvalds@woody.linux-foundation.org>
Tue, 1 Jan 2008 19:33:00 +0000 (11:33 -0800)
commitef5fa1b191fc4cda7233491626585d1397535e26
treed3d916dbf11a317e6fdc37f5852a529f938d27b9
parent77717d27c2224e1c3eec31da90272d14e8c7045c
parent56986d4210e5077d67e4eff538a316a6cc4e5158
Merge git://git./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