diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-05-20 16:38:28 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-05-20 16:38:28 -0400 |
| commit | 102dc1bae12a20214c9ee2d33a7402dc5175e30d (patch) | |
| tree | dbc2364c164db3743bd86ff02557369daac0fac4 /MAINTAINERS | |
| parent | 91444f47b2a0e50a15849f49db8c15382cd8de1b (diff) | |
| parent | bbe7b8bef48c567f5ff3f6041c1fb011292e8f12 (diff) | |
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:
MAINTAINERS: Add drivers/clocksource to TIMEKEEPING
clockevents/source: Use u64 to make 32bit happy
Diffstat (limited to 'MAINTAINERS')
| -rw-r--r-- | MAINTAINERS | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index ae67c34518cd..d76d63a4e89f 100644 --- a/MAINTAINERS +++ b/MAINTAINERS | |||
| @@ -5431,6 +5431,7 @@ F: include/linux/timex.h | |||
| 5431 | F: kernel/time/clocksource.c | 5431 | F: kernel/time/clocksource.c |
| 5432 | F: kernel/time/time*.c | 5432 | F: kernel/time/time*.c |
| 5433 | F: kernel/time/ntp.c | 5433 | F: kernel/time/ntp.c |
| 5434 | F: drivers/clocksource | ||
| 5434 | 5435 | ||
| 5435 | TLG2300 VIDEO4LINUX-2 DRIVER | 5436 | TLG2300 VIDEO4LINUX-2 DRIVER |
| 5436 | M: Huang Shijie <shijie8@gmail.com> | 5437 | M: Huang Shijie <shijie8@gmail.com> |