diff options
author | 2009-01-12 11:32:03 +0100 | |
---|---|---|
committer | 2009-01-12 11:32:03 +0100 | |
commit | e3ee1e123183ca9847e74b7b8e2694c9e3b817a6 (patch) | |
tree | 652a84674ed05eaa46a813de2223af0bd0168a5a /kernel/rtmutex.c | |
parent | hrtimers: allow the hot-unplugging of all cpus (diff) | |
parent | Linux 2.6.29-rc1 (diff) | |
download | wireguard-linux-e3ee1e123183ca9847e74b7b8e2694c9e3b817a6.tar.xz wireguard-linux-e3ee1e123183ca9847e74b7b8e2694c9e3b817a6.zip |
Merge commit 'v2.6.29-rc1' into timers/hrtimers
Conflicts:
kernel/time/tick-common.c
Diffstat (limited to 'kernel/rtmutex.c')
0 files changed, 0 insertions, 0 deletions