Merge branch 'bidir-deadlock.2' into bidir-deadlock
authorNeil Richards <ngmr@linux.vnet.ibm.com>
Wed, 27 May 2015 13:48:42 +0000 (14:48 +0100)
committerNeil Richards <ngmr@linux.vnet.ibm.com>
Wed, 27 May 2015 13:48:42 +0000 (14:48 +0100)
commitd48c200390d58d53efc3b89f9226179c48c9aee1
tree5808121dfa462d127a001756f56a9b33fb6119ff
parent4d93d897fa1cdb751727a9d2ac659c9782957ab1
parenta1cab3bca0fbe660f99dde2bbea46504f1c53b02
Merge branch 'bidir-deadlock.2' into bidir-deadlock