From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Thu, 30 Jan 2014 02:23:30 +0000 (-0800)
Subject: Merge branch 'x86-intel-mid-for-linus' of git://git.kernel.org/pub/scm/linux/kernel... 
X-Git-Tag: firefly_0821_release~176^2~4532
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=cac9283ca3dc7f4404b4034c6f06a3076c033b04;p=firefly-linux-kernel-4.4.55.git

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

Pull intel MID cleanups from Peter Anvin:
 "Miscellaneous cleanups to the intel-mid code merged earlier in this
  merge window"

* 'x86-intel-mid-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  x86, intel-mid: Cleanup some platform code's header files
  x86, intel-mid: Add missing 'void' to functions without arguments
  x86: Don't add new __cpuinit users to Merrifield platform code
  x86: Don't introduce more __cpuinit users in intel_mid_weak_decls.h
---

cac9283ca3dc7f4404b4034c6f06a3076c033b04