tree 5dd71141774a73559dbeb21c489adba6c9b06c57
parent 70ff05554f91a1edda1f11684da1dbde09e2feea
parent a361ee5cb8011763ece7b4add393e206439db8b3
author Linus Torvalds <torvalds@linux-foundation.org> 1215713993 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1215713993 -0700

Merge branch 'x86-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip

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