diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-01-26 21:46:07 +0100 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-01-26 21:46:07 +0100 |
commit | 2d3c7efa50a4a2c1ace904d28adc3d17e5139fe1 (patch) | |
tree | 04d9bb3455da26bce09deb8c9992e370356c6270 /arch/arm/mach-ixp2000/enp2611.c | |
parent | Merge branch 'perf-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/ke... (diff) | |
parent | x86/microcode_amd: Add support for CPU family specific container files (diff) | |
download | linux-2d3c7efa50a4a2c1ace904d28adc3d17e5139fe1.tar.xz linux-2d3c7efa50a4a2c1ace904d28adc3d17e5139fe1.zip |
Merge branch 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/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
Diffstat (limited to 'arch/arm/mach-ixp2000/enp2611.c')
0 files changed, 0 insertions, 0 deletions