]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 'ocfs2/linux-next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Fri, 19 Jul 2013 00:26:48 +0000 (10:26 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Fri, 19 Jul 2013 00:26:48 +0000 (10:26 +1000)
commit137f07b2bb8594562147ec92c3993a0b628321b9
tree5a6ed532d3d014a4af9fc1aa91ade3654541ca56
parentfe7cf87f9ad2de2d298fc60e083dd50f6ff78303
parent4538df64655dcfe17b33080b219dc783161a262e
Merge remote-tracking branch 'ocfs2/linux-next'
fs/ocfs2/cluster/heartbeat.c
fs/ocfs2/dlm/dlmrecovery.c