summaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-ixp4xx/nas100d-pci.c
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2014-01-20 21:07:54 +0100
committerLinus Torvalds <torvalds@linux-foundation.org>2014-01-20 21:07:54 +0100
commit2bb2c5e235e8459de5761f89bc2bcb2efd2b6b45 (patch)
tree3671fd287ecbe739cb79537fb5353bcecb939aa9 /arch/arm/mach-ixp4xx/nas100d-pci.c
parentMerge branch 'x86-intel-mid-for-linus' of git://git.kernel.org/pub/scm/linux/... (diff)
parentMerge tag 'amd_ucode_for_3.14' of git://git.kernel.org/pub/scm/linux/kernel/g... (diff)
downloadlinux-2bb2c5e235e8459de5761f89bc2bcb2efd2b6b45.tar.xz
linux-2bb2c5e235e8459de5761f89bc2bcb2efd2b6b45.zip
Merge branch 'x86-microcode-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull x86 microcode loader updates from Ingo Molnar: "There are two main changes in this tree: - AMD microcode early loading fixes - some microcode loader source files reorganization" * 'x86-microcode-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: x86, microcode: Move to a proper location x86, microcode, AMD: Fix early ucode loading x86, microcode: Share native MSR accessing variants x86, ramdisk: Export relocated ramdisk VA
Diffstat (limited to 'arch/arm/mach-ixp4xx/nas100d-pci.c')
0 files changed, 0 insertions, 0 deletions