diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-02-18 14:20:46 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-02-18 14:20:46 -0800 |
| commit | 0cc9d5257857608ba85885b75fcada13d359b5d1 (patch) | |
| tree | c36289844c623f2a3026f629d47cee793fb535ff /drivers/nfc | |
| parent | 4c3021da451fe0ea1deaba8fa3805d8d065ec84e (diff) | |
| parent | 456d66ecd09e3bc326b93174745faafb6ac378d6 (diff) | |
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: Re-enable UIE timer/polling emulation
RTC: Revert UIE emulation removal
RTC: Release mutex in error path of rtc_alarm_irq_enable
Diffstat (limited to 'drivers/nfc')
0 files changed, 0 insertions, 0 deletions