aboutsummaryrefslogtreecommitdiffstats
path: root/include/linux/swap.h
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 /include/linux/swap.h
parentMerge branch 'timers-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip (diff)
parentgenirq: Introduce irq_do_set_affinity() to reduce duplicated code (diff)
parentsmpboot, idle: Fix comment mismatch over idle_threads_init() (diff)
downloadlinux-dev-9171c670b4915e30360c2aed530b8377fbbcc852.tar.xz
linux-dev-9171c670b4915e30360c2aed530b8377fbbcc852.zip
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()