summaryrefslogtreecommitdiff
path: root/mm
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2012-06-04 11:36:51 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2012-06-04 11:36:51 -0700
commit9171c670b4915e30360c2aed530b8377fbbcc852 (patch)
treec583edd07ecd479f902b90c46ab37cf23b4fe28d /mm
parentc22072bdf053b115a1126658100967dda00b5ecf (diff)
parent818b0f3bfb236ae66cac3ff38e86b9e47f24b7aa (diff)
parent4a70d2d9909b43ed88043b98cabe2c7fbd563021 (diff)
Merge branches 'irq-urgent-for-linus' and 'smp-hotplug-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull irq and smpboot updates from Thomas Gleixner: "Just cleanup patches with no functional change and a fix for suspend issues." * 'irq-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: genirq: Introduce irq_do_set_affinity() to reduce duplicated code genirq: Add IRQS_PENDING for nested and simple irq * 'smp-hotplug-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: smpboot, idle: Fix comment mismatch over idle_threads_init() smpboot, idle: Optimize calls to smp_processor_id() in idle_threads_init()