| commit | 2d3c7efa50a4a2c1ace904d28adc3d17e5139fe1 | |
| author | Linus Torvalds <torvalds@linux-foundation.org> | |
| Thu, 26 Jan 2012 20:46:07 +0000 (26 12:46 -0800) | ||
| committer | Linus Torvalds <torvalds@linux-foundation.org> | |
| Thu, 26 Jan 2012 20:46:07 +0000 (26 12:46 -0800) | ||
| tree | 04d9bb3455da26bce09deb8c9992e370356c6270 | treesnapshot (tar.gz zip) |
| parent | b57cea5e332841ed3e11586c88d3940ea4eacbe7 | commitdiff |
| parent | 5b68edc91cdc972c46f76f85eded7ffddc3ff5c2 | commitdiff |
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
* '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