summaryrefslogtreecommitdiffstats
path: root/kernel/dma.c
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2015-02-21 10:36:06 -0800
committerLinus Torvalds <torvalds@linux-foundation.org>2015-02-21 10:36:06 -0800
commit3f4d9925e9174b8786bfbb6e9aa132aa6745078f (patch)
tree873f1e20eb12bca7e65ced054251b4b317c8333a /kernel/dma.c
parentdd36929720f40f17685e841ae0d4c581c165ea60 (diff)
parent3b3336d4fed58ea5a019a8a1d00fa741be492716 (diff)
parentd97eb8966c91f2c9d05f0a22eb89ed5b76d966d1 (diff)
downloadlinux-3f4d9925e9174b8786bfbb6e9aa132aa6745078f.tar.bz2
Merge branches 'core-urgent-for-linus' and 'irq-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull rcu fix and x86 irq fix from Ingo Molnar: - Fix a bug that caused an RCU warning splat. - Two x86 irq related fixes: a hotplug crash fix and an ACPI IRQ registry fix. * 'core-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: rcu: Clear need_qs flag to prevent splat * 'irq-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: x86/irq: Check for valid irq descriptor in check_irq_vectors_for_cpu_disable() x86/irq: Fix regression caused by commit b568b8601f05