diff options
| author | Linus Torvalds | 2010-03-01 08:48:25 -0800 |
|---|---|---|
| committer | Linus Torvalds | 2010-03-01 08:48:25 -0800 |
| commit | e56425b135a8892d1e71ad5bb605d12c10efeb32 (patch) | |
| tree | 9bb899e1b6b45a125bcc21554f3673878d932035 /kernel/pid.c | |
| parent | 786f8ba2e9449a7f01ec6bc35838d0a335921061 (diff) | |
| parent | 6622e670b26fbaa9c4ae7772a4d2d0abd3414b51 (diff) | |
Merge branch 'timers-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
* 'timers-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
posix-timers.c: Don't export local functions
clocksource: start CMT at clocksource resume
clocksource: add suspend callback
clocksource: add argument to resume callback
ntp: Cleanup xtime references in ntp.c
ntp: Make time_esterror and time_maxerror static
Diffstat (limited to 'kernel/pid.c')
0 files changed, 0 insertions, 0 deletions