summaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2011-05-20 02:44:40 +0200
committerLinus Torvalds <torvalds@linux-foundation.org>2011-05-20 02:44:40 +0200
commit7e6628e4bcb3b3546c625ec63ca724f28ab14f0c (patch)
tree111a94cefa9d800ec5c5e59520f4b5d1880965d0 /drivers
parentMerge branch 'timers-clocksource-for-linus' of git://git.kernel.org/pub/scm/l... (diff)
parentx86: hpet: Cleanup the clockevents init and register code (diff)
downloadlinux-7e6628e4bcb3b3546c625ec63ca724f28ab14f0c.tar.xz
linux-7e6628e4bcb3b3546c625ec63ca724f28ab14f0c.zip
Merge branch 'timers-clockevents-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
* 'timers-clockevents-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: x86: hpet: Cleanup the clockevents init and register code x86: Convert PIT to clockevents_config_and_register() clockevents: Provide interface to reconfigure an active clock event device clockevents: Provide combined configure and register function clockevents: Restructure clock_event_device members clocksource: Get rid of the hardcoded 5 seconds sleep time limit clocksource: Restructure clocksource struct members
Diffstat (limited to 'drivers')
0 files changed, 0 insertions, 0 deletions