diff options
| author | Thomas Gleixner <[email protected]> | 2008-10-22 07:48:06 +0000 |
|---|---|---|
| committer | Thomas Gleixner <[email protected]> | 2008-10-22 07:48:06 +0000 |
| commit | 268a3dcfea2077fca60d3715caa5c96f9b5e6ea7 (patch) | |
| tree | c2232774508424e677e27f296090a68c775e4669 /net/unix/af_unix.c | |
| parent | NOHZ: fix thinko in the timer restart code path (diff) | |
| parent | hrtimers: add missing docbook comments to struct hrtimer (diff) | |
| download | kernel-268a3dcfea2077fca60d3715caa5c96f9b5e6ea7.tar.gz kernel-268a3dcfea2077fca60d3715caa5c96f9b5e6ea7.zip | |
Merge branch 'timers/range-hrtimers' into v28-range-hrtimers-for-linus-v2
Conflicts:
kernel/time/tick-sched.c
Signed-off-by: Thomas Gleixner <[email protected]>
Diffstat (limited to 'net/unix/af_unix.c')
0 files changed, 0 insertions, 0 deletions