diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-05-23 12:12:26 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-05-23 12:12:26 -0400 |
| commit | 57d19e80f459dd845fb3cfeba8e6df8471bac142 (patch) | |
| tree | 8254766715720228db3d50f1ef3c7fe003c06d65 /include/linux/posix-clock.h | |
| parent | ee9ec4f82049c678373a611ce20ac67fe9ad836e (diff) | |
| parent | e64851f5a0ad6ec991f74ebb3108c35aa0323d5f (diff) | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial: (39 commits)
b43: fix comment typo reqest -> request
Haavard Skinnemoen has left Atmel
cris: typo in mach-fs Makefile
Kconfig: fix copy/paste-ism for dell-wmi-aio driver
doc: timers-howto: fix a typo ("unsgined")
perf: Only include annotate.h once in tools/perf/util/ui/browsers/annotate.c
md, raid5: Fix spelling error in comment ('Ofcourse' --> 'Of course').
treewide: fix a few typos in comments
regulator: change debug statement be consistent with the style of the rest
Revert "arm: mach-u300/gpio: Fix mem_region resource size miscalculations"
audit: acquire creds selectively to reduce atomic op overhead
rtlwifi: don't touch with treewide double semicolon removal
treewide: cleanup continuations and remove logging message whitespace
ath9k_hw: don't touch with treewide double semicolon removal
include/linux/leds-regulator.h: fix syntax in example code
tty: fix typo in descripton of tty_termios_encode_baud_rate
xtensa: remove obsolete BKL kernel option from defconfig
m68k: fix comment typo 'occcured'
arch:Kconfig.locks Remove unused config option.
treewide: remove extra semicolons
...
Diffstat (limited to 'include/linux/posix-clock.h')
| -rw-r--r-- | include/linux/posix-clock.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/posix-clock.h b/include/linux/posix-clock.h index 7f1183dcd119..34c4498b800f 100644 --- a/include/linux/posix-clock.h +++ b/include/linux/posix-clock.h | |||
| @@ -45,7 +45,7 @@ struct posix_clock; | |||
| 45 | * @timer_create: Create a new timer | 45 | * @timer_create: Create a new timer |
| 46 | * @timer_delete: Remove a previously created timer | 46 | * @timer_delete: Remove a previously created timer |
| 47 | * @timer_gettime: Get remaining time and interval of a timer | 47 | * @timer_gettime: Get remaining time and interval of a timer |
| 48 | * @timer_setttime: Set a timer's initial expiration and interval | 48 | * @timer_settime: Set a timer's initial expiration and interval |
| 49 | * @fasync: Optional character device fasync method | 49 | * @fasync: Optional character device fasync method |
| 50 | * @mmap: Optional character device mmap method | 50 | * @mmap: Optional character device mmap method |
| 51 | * @open: Optional character device open method | 51 | * @open: Optional character device open method |