]> git.kernelconcepts.de Git - karo-tx-linux.git/commitdiff
Merge remote-tracking branch 'ocfs2/linux-next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Sun, 21 Oct 2012 23:50:02 +0000 (10:50 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Sun, 21 Oct 2012 23:50:02 +0000 (10:50 +1100)
1  2 
fs/ocfs2/cluster/heartbeat.c

Simple merge