diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-02-14 18:10:07 (GMT) |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-02-14 18:10:07 (GMT) |
commit | f1b6a4ec27f3c789c15a157590295c501b0a1c58 (patch) | |
tree | 52659e15f469d43c381cff1e2928652bca020df0 /drivers/net | |
parent | 795abaf1e4e188c4171e3cd3dbb11a9fcacaf505 (diff) | |
parent | 6ee5859df5baabb82014573d126b9fd790c3a9d8 (diff) | |
download | linux-fsl-qoriq-f1b6a4ec27f3c789c15a157590295c501b0a1c58.tar.xz |
Merge branch 'rtc-for-linus' of git://git.kernel.org/pub/scm/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
Diffstat (limited to 'drivers/net')
0 files changed, 0 insertions, 0 deletions