]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 'ocfs2/linux-next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Wed, 19 Jun 2013 01:55:18 +0000 (11:55 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Wed, 19 Jun 2013 01:55:18 +0000 (11:55 +1000)
commit36d43ff686fd299d289618e3616c75dd22274a0d
treee13f0380765b94c9380c4274e03d08bebeb2ef9c
parentbff6e9d269b92c3f103ce8c43e0f7f2adcea8798
parent4538df64655dcfe17b33080b219dc783161a262e
Merge remote-tracking branch 'ocfs2/linux-next'
fs/ocfs2/cluster/heartbeat.c
fs/ocfs2/dlm/dlmrecovery.c