From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Fri, 9 Dec 2011 22:45:12 +0000 (-0800)
Subject: Merge branch 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel... 
X-Git-Tag: firefly_0821_release~3680^2~3964
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=a776878d6cf8a81fa65b29aa9bd6a10a5131e71c;p=firefly-linux-kernel-4.4.55.git

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

* 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  x86, efi: Calling __pa() with an ioremap()ed address is invalid
  x86, hpet: Immediately disable HPET timer 1 if rtc irq is masked
  x86/intel_mid: Kconfig select fix
  x86/intel_mid: Fix the Kconfig for MID selection
---

a776878d6cf8a81fa65b29aa9bd6a10a5131e71c