diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2013-04-15 07:03:01 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2013-04-15 07:03:01 -0700 |
| commit | bb33db7a076f4719dc68c235e187dd4bfb16b621 (patch) | |
| tree | 495a618502af9a6a0df4dd8d410a850e744af60b /drivers/media/platform/s5p-fimc/fimc-lite.c | |
| parent | 41ef2d5678d83af030125550329b6ae8b74618fa (diff) | |
| parent | 84cc8fd2fe65866e49d70b38b3fdf7219dd92fe0 (diff) | |
| parent | bad9a43a20372a3b41e15e8aa03b918c76f360f0 (diff) | |
| parent | f2530dc71cf0822f90bb63ea4600caaef33a66bb (diff) | |
Merge branches 'timers-urgent-for-linus', 'irq-urgent-for-linus' and 'core-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull {timer,irq,core} fixes from Thomas Gleixner:
- timer: bug fix for a cpu hotplug race.
- irq: single bugfix for a wrong return value, which prevents the
calling function to invoke the software fallback.
- core: bugfix which plugs two race confitions which can cause hotplug
per cpu threads to end up on the wrong cpu.
* 'timers-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
hrtimer: Don't reinitialize a cpu_base lock on CPU_UP
* 'irq-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
irqchip: gic: fix irq_trigger return
* 'core-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
kthread: Prevent unpark race which puts threads on the wrong cpu