]> git.proxmox.com Git - mirror_ubuntu-disco-kernel.git/commitdiff
Merge branches 'irq-urgent-for-linus', 'x86-urgent-for-linus' and 'sched-urgent-for...
authorLinus Torvalds <torvalds@linux-foundation.org>
Sat, 1 Oct 2011 15:37:25 +0000 (08:37 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Sat, 1 Oct 2011 15:37:25 +0000 (08:37 -0700)
* '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


Trivial merge