summaryrefslogtreecommitdiffstats
path: root/arch/x86/Kconfig
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2015-01-26 03:07:01 +0100
committerLinus Torvalds <torvalds@linux-foundation.org>2015-01-26 03:07:01 +0100
commit4d2f0ef1c9f78c99dc82baeee3996c4a0c914aac (patch)
treee5b593e1340bdf7b66e9a9d1d2c69827c473125b /arch/x86/Kconfig
parentMerge branch 'timers-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/... (diff)
parentMerge tag 'irqchip-urgent-3.19' of git://git.infradead.org/users/jcooper/linu... (diff)
downloadlinux-4d2f0ef1c9f78c99dc82baeee3996c4a0c914aac.tar.xz
linux-4d2f0ef1c9f78c99dc82baeee3996c4a0c914aac.zip
Merge branch 'irq-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull irq fixes from Thomas Gleixner: "From the irqchip departement you get: - regression fix for omap-intc - regression fix for atmel-aic-common - functional correctness fix for hip04 - type mismatch fix for gic-v3-its - proper error pointer check for mtd-sysirq Mostly one and two liners except for the omap regression fix which is slightly larger than desired" * 'irq-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: irqchip: atmel-aic-common: Prevent clobbering of priority when changing IRQ type irqchip: omap-intc: Fix legacy DMA regression irqchip: gic-v3-its: Fix use of max with decimal constant irqchip: hip04: Initialize hip04_cpu_map to 0xffff irqchip: mtk-sysirq: Use IS_ERR() instead of NULL pointer check
Diffstat (limited to 'arch/x86/Kconfig')
0 files changed, 0 insertions, 0 deletions