]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
Merge remote-tracking branch 'ocfs2/linux-next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Wed, 10 Oct 2012 22:49:29 +0000 (09:49 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Wed, 10 Oct 2012 22:49:29 +0000 (09:49 +1100)
1  2 
fs/ocfs2/cluster/heartbeat.c

Simple merge