diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-01-11 20:06:41 +0100 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-01-11 20:06:41 +0100 |
| commit | 5943a268002fce97885f2ca08827ff1b0312068c (patch) | |
| tree | 5e304e79b68263e799224ebb1a08ead474ab299b /drivers/rtc/rtc-ds1742.c | |
| parent | Merge branch 'perf-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/ker... (diff) | |
| parent | rtc: Namespace fixup (diff) | |
| download | linux-5943a268002fce97885f2ca08827ff1b0312068c.tar.xz linux-5943a268002fce97885f2ca08827ff1b0312068c.zip | |
Merge branch 'timers-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
* 'timers-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
rtc: Namespace fixup
RTC: Remove UIE emulation
RTC: Rework RTC code to use timerqueue for events
Fix up trivial conflict in drivers/rtc/rtc-dev.c
Diffstat (limited to 'drivers/rtc/rtc-ds1742.c')
0 files changed, 0 insertions, 0 deletions