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

Simple merge