summaryrefslogtreecommitdiffstats
path: root/fs/ocfs2/journal.h
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2011-02-18 23:20:46 +0100
committerLinus Torvalds <torvalds@linux-foundation.org>2011-02-18 23:20:46 +0100
commit0cc9d5257857608ba85885b75fcada13d359b5d1 (patch)
treec36289844c623f2a3026f629d47cee793fb535ff /fs/ocfs2/journal.h
parentMerge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6 (diff)
parentRTC: Re-enable UIE timer/polling emulation (diff)
downloadlinux-0cc9d5257857608ba85885b75fcada13d359b5d1.tar.xz
linux-0cc9d5257857608ba85885b75fcada13d359b5d1.zip
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 'fs/ocfs2/journal.h')
0 files changed, 0 insertions, 0 deletions