diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-01-15 21:45:00 +0100 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-01-15 21:45:00 +0100 |
| commit | f9ee7f60d6f37ae0184812b4c59b3869f875768b (patch) | |
| tree | 6c30a7e94b90cfa3a43cda45f4bdb2f254f3ba10 /init/Kconfig | |
| parent | Merge branch 'devel-stable' of master.kernel.org:/home/rmk/linux-2.6-arm (diff) | |
| parent | Merge branch 'rcu/next' of git://git.kernel.org/pub/scm/linux/kernel/git/paul... (diff) | |
| parent | x86, olpc: Add missing Kconfig dependencies (diff) | |
| parent | timekeeping: Make local variables static (diff) | |
| parent | Merge branch 'tip/perf/urgent' of git://git.kernel.org/pub/scm/linux/kernel/g... (diff) | |
| download | linux-f9ee7f60d6f37ae0184812b4c59b3869f875768b.tar.xz linux-f9ee7f60d6f37ae0184812b4c59b3869f875768b.zip | |
Merge branches 'core-fixes-for-linus', 'x86-fixes-for-linus', 'timers-fixes-for-linus' and 'perf-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:
rcu: avoid pointless blocked-task warnings
rcu: demote SRCU_SYNCHRONIZE_DELAY from kernel-parameter status
rtmutex: Fix comment about why new_owner can be NULL in wake_futex_pi()
* 'x86-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
x86, olpc: Add missing Kconfig dependencies
x86, mrst: Set correct APB timer IRQ affinity for secondary cpu
x86: tsc: Fix calibration refinement conditionals to avoid divide by zero
x86, ia64, acpi: Clean up x86-ism in drivers/acpi/numa.c
* 'timers-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
timekeeping: Make local variables static
time: Rename misnamed minsec argument of clocks_calc_mult_shift()
* 'perf-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
tracing: Remove syscall_exit_fields
tracing: Only process module tracepoints once
perf record: Add "nodelay" mode, disabled by default
perf sched: Fix list of events, dropping unsupported ':r' modifier
Revert "perf tools: Emit clearer message for sys_perf_event_open ENOENT return"
perf top: Fix annotate segv
perf evsel: Fix order of event list deletion