summaryrefslogtreecommitdiffstats
path: root/kernel/sys.c
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2009-02-17 14:29:42 -0800
committerLinus Torvalds <torvalds@linux-foundation.org>2009-02-17 14:29:42 -0800
commit29a0c5ce5d008f398346d644456d62ab300d5e10 (patch)
treef549f6c78905f318f0e6342edede01cb7c0561b9 /kernel/sys.c
parentf8effd1a4a1833eac90261d78abacfaefe3d99e4 (diff)
parent3997ad317fdf9ecdb5702e2b4fd1f8229814ff8c (diff)
downloadlinux-29a0c5ce5d008f398346d644456d62ab300d5e10.tar.gz
linux-29a0c5ce5d008f398346d644456d62ab300d5e10.tar.bz2
linux-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 'kernel/sys.c')
0 files changed, 0 insertions, 0 deletions