aboutsummaryrefslogtreecommitdiff
path: root/kernel
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2013-09-28 14:22:17 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2013-09-28 14:22:17 -0700
commit669fc2f0c70a6e14eefc503b72ce350448e9634e (patch)
tree86a3668878788661bbd2b20cc207fd447b6e7f15 /kernel
parent9b565a8051b389e046209a5f68c93eade8de58bd (diff)
parent62d08aec6a9f4b45cc9cba1e3b2855995df133e6 (diff)
parent2199a5574b6d94b9ca26c6345356f45ec60fef8b (diff)
parentaccd1e823ed1d5980106dd522a4c535084400830 (diff)
downloadlinaro-lsk-669fc2f0c70a6e14eefc503b72ce350448e9634e.tar.gz
Merge branches 'sched-urgent-for-linus', 'timers-urgent-for-linus' and 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull scheduler, timer and x86 fixes from Ingo Molnar: - A context tracking ARM build and functional fix - A handful of ARM clocksource/clockevent driver fixes - An AMD microcode patch level sysfs reporting fixlet * 'sched-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: arm: Fix build error with context tracking calls * 'timers-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: clocksource: em_sti: Set cpu_possible_mask to fix SMP broadcast clocksource: of: Respect device tree node status clocksource: exynos_mct: Set IRQ affinity when the CPU goes online arm: clocksource: mvebu: Use the main timer as clock source from DT * 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: x86/microcode/AMD: Fix patch level reporting for family 15h