diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-03-01 17:48:25 +0100 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-03-01 17:48:25 +0100 |
| commit | e56425b135a8892d1e71ad5bb605d12c10efeb32 (patch) | |
| tree | 9bb899e1b6b45a125bcc21554f3673878d932035 /drivers/char/nvram.c | |
| parent | scsi.c: add missing kernel-doc notation for new VPD parameters (diff) | |
| parent | posix-timers.c: Don't export local functions (diff) | |
| download | linux-e56425b135a8892d1e71ad5bb605d12c10efeb32.tar.xz linux-e56425b135a8892d1e71ad5bb605d12c10efeb32.zip | |
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 'drivers/char/nvram.c')
0 files changed, 0 insertions, 0 deletions