Merge branch 'x86-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git...
authorLinus Torvalds <torvalds@linux-foundation.org>
Thu, 10 Jul 2008 18:19:53 +0000 (11:19 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Thu, 10 Jul 2008 18:19:53 +0000 (11:19 -0700)
* 'x86-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
  x86: fix /dev/mem compatibility under PAT


Trivial merge