]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
Merge remote-tracking branch 'ocfs2/linux-next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Mon, 5 Aug 2013 00:49:09 +0000 (10:49 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Mon, 5 Aug 2013 00:49:09 +0000 (10:49 +1000)
1  2 
fs/ocfs2/cluster/heartbeat.c
fs/ocfs2/dlm/dlmrecovery.c

Simple merge
Simple merge