From: Linus Torvalds <torvalds@woody.linux-foundation.org>
Date: Tue, 1 Jan 2008 19:33:00 +0000 (-0800)
Subject: Merge git://git.kernel.org/pub/scm/linux/kernel/git/x86/linux-2.6-x86
X-Git-Tag: v2.6.24-rc7~21
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ef5fa1b191fc4cda7233491626585d1397535e26;p=linux-2.6

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
---

ef5fa1b191fc4cda7233491626585d1397535e26