kernel/sys.c · 65131cd52b9e7c5814298e05c3b7843f13e78d24 · Eric Clark / linux · GitLab

Snippets Groups Projects

16 years ago
268a3dcf
Merge branch 'timers/range-hrtimers' into v28-range-hrtimers-for-linus-v2 · 268a3dcf
Thomas Gleixner authored 16 years ago
```
Conflicts:

	kernel/time/tick-sched.c

Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
```
268a3dcf

History
Merge branch 'timers/range-hrtimers' into v28-range-hrtimers-for-linus-v2
Thomas Gleixner authored 16 years ago
```
Conflicts:

	kernel/time/tick-sched.c

Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
```