diff options
author | 2009-02-17 14:29:42 -0800 | |
---|---|---|
committer | 2009-02-17 14:29:42 -0800 | |
commit | 29a0c5ce5d008f398346d644456d62ab300d5e10 (patch) | |
tree | f549f6c78905f318f0e6342edede01cb7c0561b9 /include/linux/blktrace_api.h | |
parent | Merge branch 'tracing-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip (diff) | |
parent | timers: more consistently use clock vs timer (diff) | |
download | linux-rng-29a0c5ce5d008f398346d644456d62ab300d5e10.tar.xz linux-rng-29a0c5ce5d008f398346d644456d62ab300d5e10.zip |
Merge branch 'timers-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
* 'timers-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
timers: more consistently use clock vs timer
Diffstat (limited to 'include/linux/blktrace_api.h')
0 files changed, 0 insertions, 0 deletions