commit 74c7d2f5200a340ae6655e9adcf990381e387937
author Linus Torvalds <torvalds@linux-foundation.org> Tue Apr 30 08:42:11 2013 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> Tue Apr 30 08:42:11 2013 -0700
tree 13e5290fff662995e769e64dbd5b64450296dcc6
parent 1e2f5b598aa56c3978c2e623f72e9656a565c6c9
parent 06d219dc22daa26b79ec8e611caa68801607f15d

Merge branch 'x86-platform-for-linus' of git://git.kernel.org/pub/scm/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()