diff options
| author | Linus Torvalds <[email protected]> | 2011-06-25 14:23:59 +0000 |
|---|---|---|
| committer | Linus Torvalds <[email protected]> | 2011-06-25 14:23:59 +0000 |
| commit | 8abf55883431a91d4877933240c8419b7fc17274 (patch) | |
| tree | c7de035cf068f3edf5053a30d912c2024bac88d8 /net/lapb/lapb_iface.c | |
| parent | Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiw... (diff) | |
| parent | Merge branch 'fortglx/3.0/tip/timers/rtc' of git://git.linaro.org/people/jstu... (diff) | |
| download | kernel-8abf55883431a91d4877933240c8419b7fc17274.tar.gz kernel-8abf55883431a91d4877933240c8419b7fc17274.zip | |
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/lapb/lapb_iface.c')
0 files changed, 0 insertions, 0 deletions