From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Tue, 30 Apr 2013 15:42:11 +0000 (-0700)
Subject: Merge branch 'x86-platform-for-linus' of git://git.kernel.org/pub/scm/linux/kernel... 
X-Git-Tag: firefly_0821_release~3680^2~645
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=74c7d2f5200a340ae6655e9adcf990381e387937;p=firefly-linux-kernel-4.4.55.git

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

Pull x86 platform changes from Ingo Molnar:
 "Small fixes and cleanups all over the map"

* 'x86-platform-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  x86/setup: Drop unneeded include <asm/dmi.h>
  x86/olpc/xo1/sci: Don't call input_free_device() after input_unregister_device()
  x86/platform/intel/mrst: Remove cast for kmalloc() return value
  x86/platform/uv: Replace kmalloc() & memset with kzalloc()
---

74c7d2f5200a340ae6655e9adcf990381e387937