From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Tue, 2 Jul 2013 23:29:05 +0000 (-0700)
Subject: Merge branch 'x86-mm-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git... 
X-Git-Tag: firefly_0821_release~176^2~5820
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=1982269a5c51c70cddceb8d157f07b522aee0a2d;p=firefly-linux-kernel-4.4.55.git

Merge branch 'x86-mm-for-linus' of git://git./linux/kernel/git/tip/tip

Pull x86 mm changes from Ingo Molnar:
 "Misc improvements:

   - Fix /proc/mtrr reporting
   - Fix ioremap printout
   - Remove the unused pvclock fixmap entry on 32-bit
   - misc cleanups"

* 'x86-mm-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  x86/ioremap: Correct function name output
  x86: Fix /proc/mtrr with base/size more than 44bits
  ix86: Don't waste fixmap entries
  x86/mm: Drop unneeded include <asm/*pgtable, page*_types.h>
  x86_64: Correct phys_addr in cleanup_highmap comment
---

1982269a5c51c70cddceb8d157f07b522aee0a2d