diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-10-01 08:37:25 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-10-01 08:37:25 -0700 |
| commit | f72a209a3e694ecb8d3ceed4671d98c4364e00e3 (patch) | |
| tree | e15bb43a4eb82ead5ca2aa387069353481f3cdef /arch/mips/lasat/ds1603.c | |
| parent | 47ea91b4052d9e94b9dca5d7a3d947fbebd07ba9 (diff) | |
| parent | eef24afb28561a5a9f4be8f8da97735b7e6a826f (diff) | |
| parent | 47997d756aa2a84ab577e1b0383cc12d582fc69c (diff) | |
| parent | d670ec13178d0fd8680e6742a2bc6e04f28f87d8 (diff) | |
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