From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Wed, 8 Sep 2010 18:14:10 +0000 (-0700)
Subject: Merge branch 'x86-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git... 
X-Git-Tag: firefly_0821_release~9833^2~597
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=1faa6ec8ccbde8c4f0237be80473a4294ebf8289;p=firefly-linux-kernel-4.4.55.git

Merge branch 'x86-fixes-for-linus' of git://git./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, mcheck: Avoid duplicate sysfs links/files for thresholding banks
  io-mapping: Fix the address space annotations
  x86: Fix the address space annotations of iomap_atomic_prot_pfn()
  x86, mm: Fix CONFIG_VMSPLIT_1G and 2G_OPT trampoline
  x86, hwmon: Fix unsafe smp_processor_id() in thermal_throttle_add_dev
---

1faa6ec8ccbde8c4f0237be80473a4294ebf8289