| commit | f1b6a4ec27f3c789c15a157590295c501b0a1c58 | |
| author | Linus Torvalds <torvalds@linux-foundation.org> | |
| Mon, 14 Feb 2011 18:10:07 +0000 (14 10:10 -0800) | ||
| committer | Linus Torvalds <torvalds@linux-foundation.org> | |
| Mon, 14 Feb 2011 18:10:07 +0000 (14 10:10 -0800) | ||
| tree | 52659e15f469d43c381cff1e2928652bca020df0 | treesnapshot (tar.gz zip) |
| parent | 795abaf1e4e188c4171e3cd3dbb11a9fcacaf505 | commitdiff |
| parent | 6ee5859df5baabb82014573d126b9fd790c3a9d8 | commitdiff |
Merge branch 'rtc-for-linus' of git://git./linux/kernel/git/tip/linux-2.6-tip
* 'rtc-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
RTC: Fix minor compile warning
RTC: Convert rtc drivers to use the alarm_irq_enable method
RTC: Fix rtc driver ioctl specific shortcutting
* 'rtc-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
RTC: Fix minor compile warning
RTC: Convert rtc drivers to use the alarm_irq_enable method
RTC: Fix rtc driver ioctl specific shortcutting