diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-06-25 10:23:59 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-06-25 10:23:59 -0400 |
| commit | 8abf55883431a91d4877933240c8419b7fc17274 (patch) | |
| tree | c7de035cf068f3edf5053a30d912c2024bac88d8 /net/ipv6/xfrm6_state.c | |
| parent | 4d362ad280fca0f2e098de607534f72f2c243e12 (diff) | |
| parent | b1eb085c064d0843826d7402db7fc5f3032e01fc (diff) | |
Merge branch 'timer-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
* 'timer-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
rtc: vt8500: Fix build error & cleanup rtc_class_ops->update_irq_enable()
alarmtimers: Return -ENOTSUPP if no RTC device is present
alarmtimers: Handle late rtc module loading
Diffstat (limited to 'net/ipv6/xfrm6_state.c')
0 files changed, 0 insertions, 0 deletions