summaryrefslogtreecommitdiffstats
path: root/kernel
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2011-10-01 17:37:25 +0200
committerLinus Torvalds <torvalds@linux-foundation.org>2011-10-01 17:37:25 +0200
commitf72a209a3e694ecb8d3ceed4671d98c4364e00e3 (patch)
treee15bb43a4eb82ead5ca2aa387069353481f3cdef /kernel
parentResource: fix wrong resource window calculation (diff)
parentirq: Fix check for already initialized irq_domain in irq_domain_add (diff)
parentx86/rtc: Don't recursively acquire rtc_lock (diff)
parentposix-cpu-timers: Cure SMP wobbles (diff)
downloadlinux-f72a209a3e694ecb8d3ceed4671d98c4364e00e3.tar.xz
linux-f72a209a3e694ecb8d3ceed4671d98c4364e00e3.zip
Merge branches 'irq-urgent-for-linus', 'x86-urgent-for-linus' and 'sched-urgent-for-linus' of git://tesla.tglx.de/git/linux-2.6-tip
* 'irq-urgent-for-linus' of git://tesla.tglx.de/git/linux-2.6-tip: irq: Fix check for already initialized irq_domain in irq_domain_add irq: Add declaration of irq_domain_simple_ops to irqdomain.h * 'x86-urgent-for-linus' of git://tesla.tglx.de/git/linux-2.6-tip: x86/rtc: Don't recursively acquire rtc_lock * 'sched-urgent-for-linus' of git://tesla.tglx.de/git/linux-2.6-tip: posix-cpu-timers: Cure SMP wobbles sched: Fix up wchan borkage sched/rt: Migrate equal priority tasks to available CPUs