diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-04-16 09:45:08 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-04-16 09:45:08 -0700 |
| commit | fdfc552abe2c465ab91b84fb65f36d86c6737ab4 (patch) | |
| tree | 8c581c34fcf7e462783b9ce404901ee8ad4a6490 /kernel/futex.c | |
| parent | 0ebc115da3ed67409792eb8de46361a5c673f072 (diff) | |
| parent | 0cd9c6494ee5c19aef085152bc37f3a4e774a9e1 (diff) | |
| parent | e566b76ed30768140df8f0023904aed5a41244f7 (diff) | |
| parent | b30aef17f71cf9e24b10c11cbb5e5f0ebe8a85ab (diff) | |
| parent | 92f73a62a100d2068e8f327e573da01529184c18 (diff) | |
| parent | 5bbc097d890409d8eff4e3f1d26f11a9d6b7c07e (diff) | |
Merge branches 'core-fixes-for-linus', 'perf-fixes-for-linus', 'sched-fixes-for-linus', 'timer-fixes-for-linus' and 'x86-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
* 'core-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
futex: Set FLAGS_HAS_TIMEOUT during futex_wait restart setup
* 'perf-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
perf_event: Fix cgrp event scheduling bug in perf_enable_on_exec()
perf: Fix a build error with some GCC versions
* 'sched-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
sched: Fix erroneous all_pinned logic
sched: Fix sched-domain avg_load calculation
* 'timer-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
RTC: rtc-mrst: follow on to the change of rtc_device_register()
RTC: add missing "return 0" in new alarm func for rtc-bfin.c
RTC: Fix s3c compile error due to missing s3c_rtc_setpie
RTC: Fix early irqs caused by calling rtc_set_alarm too early
* 'x86-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
x86, amd: Disable GartTlbWlkErr when BIOS forgets it
x86, NUMA: Fix fakenuma boot failure
x86/mrst: Fix boot crash caused by incorrect pin to irq mapping
x86/ce4100: Add reg property to bridges