diff options
| author | Linus Torvalds <[email protected]> | 2007-10-18 22:12:41 +0000 |
|---|---|---|
| committer | Linus Torvalds <[email protected]> | 2007-10-18 22:12:41 +0000 |
| commit | 58f9b52ee8712283f7ffedb661df678c61e88a91 (patch) | |
| tree | fe6d2e1bca6befd8ca347487a7c053b8136320ad /fs/proc/array.c | |
| parent | Merge branch 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/... (diff) | |
| parent | hrtimer: hook compat_sys_nanosleep up to high res timer code (diff) | |
| download | kernel-58f9b52ee8712283f7ffedb661df678c61e88a91.tar.gz kernel-58f9b52ee8712283f7ffedb661df678c61e88a91.zip | |
Merge ssh://master.kernel.org/pub/scm/linux/kernel/git/tglx/linux-2.6-hrt
* ssh://master.kernel.org/pub/scm/linux/kernel/git/tglx/linux-2.6-hrt:
hrtimer: hook compat_sys_nanosleep up to high res timer code
hrtimer: Rework hrtimer_nanosleep to make sys_compat_nanosleep easier
Diffstat (limited to 'fs/proc/array.c')
0 files changed, 0 insertions, 0 deletions