From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Thu, 26 Jan 2012 20:46:07 +0000 (-0800)
Subject: Merge branch 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel... 
X-Git-Tag: v3.3-rc2~24
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=2d3c7efa50a4a2c1ace904d28adc3d17e5139fe1;p=profile%2Fivi%2Fkernel-adaptation-intel-automotive.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/microcode_amd: Add support for CPU family specific container files
  x86/amd: Add missing feature flag for fam15h models 10h-1fh processors
  x86/boot-image: Don't leak phdrs in arch/x86/boot/compressed/misc.c::Parse_elf()
  x86/numachip: Drop unnecessary conflict with EDAC
  x86/uv: Fix uninitialized spinlocks
  x86/uv: Fix uv_gpa_to_soc_phys_ram() shift
---

2d3c7efa50a4a2c1ace904d28adc3d17e5139fe1