diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-05-20 04:44:40 +0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-05-20 04:44:40 +0400 |
| commit | 7e6628e4bcb3b3546c625ec63ca724f28ab14f0c (patch) | |
| tree | 111a94cefa9d800ec5c5e59520f4b5d1880965d0 /include/linux/inotify.h | |
| parent | 0f1bdc1815c4cb29b3cd71a7091b478e426faa0b (diff) | |
| parent | ab0e08f15d23628dd8d50bf6ce1a935a8840c7dc (diff) | |
| download | linux-7e6628e4bcb3b3546c625ec63ca724f28ab14f0c.tar.xz | |
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 'include/linux/inotify.h')
0 files changed, 0 insertions, 0 deletions