diff options
author | 2011-02-28 17:52:47 -0800 | |
---|---|---|
committer | 2011-02-28 17:52:47 -0800 | |
commit | 158a5d61f780b707da0b559cf60d72294006aa97 (patch) | |
tree | f4e86dfdca114123f282ba9000ee7470844e91c0 /drivers/rtc/rtc-s3c.c | |
parent | Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6 (diff) | |
parent | ocfs2: Check heartbeat mode for kernel stacks only (diff) | |
download | wireguard-linux-158a5d61f780b707da0b559cf60d72294006aa97.tar.xz wireguard-linux-158a5d61f780b707da0b559cf60d72294006aa97.zip |
Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jlbec/ocfs2
* 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jlbec/ocfs2:
ocfs2: Check heartbeat mode for kernel stacks only
Ocfs2/refcounttree: Fix a bug for refcounttree to writeback clusters in a right number.
ocfs2: Fix estimate of necessary credits for mkdir
Diffstat (limited to 'drivers/rtc/rtc-s3c.c')
0 files changed, 0 insertions, 0 deletions