diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-06-04 20:36:51 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-06-04 20:36:51 +0200 |
| commit | 9171c670b4915e30360c2aed530b8377fbbcc852 (patch) | |
| tree | c583edd07ecd479f902b90c46ab37cf23b4fe28d /mm | |
| parent | Merge branch 'timers-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/... (diff) | |
| parent | genirq: Introduce irq_do_set_affinity() to reduce duplicated code (diff) | |
| parent | smpboot, idle: Fix comment mismatch over idle_threads_init() (diff) | |
| download | linux-9171c670b4915e30360c2aed530b8377fbbcc852.tar.xz linux-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()