Merge branch 'release/2.22/master' into ibm/2.22/master

author Tulio Magno Quites Machado Filho <tuliom@linux.vnet.ibm.com>

Thu, 17 Dec 2015 19:31:21 +0000 (17:31 -0200)

committer Tulio Magno Quites Machado Filho <tuliom@linux.vnet.ibm.com>

Thu, 17 Dec 2015 19:31:21 +0000 (17:31 -0200)
author Tulio Magno Quites Machado Filho <tuliom@linux.vnet.ibm.com>
Thu, 17 Dec 2015 19:31:21 +0000 (17:31 -0200)
committer Tulio Magno Quites Machado Filho <tuliom@linux.vnet.ibm.com>
Thu, 17 Dec 2015 19:31:21 +0000 (17:31 -0200)
diff --cc ChangeLog
Simple merge
diff --cc sysdeps/unix/sysv/linux/powerpc/elision-lock.c
Simple merge
author	Tulio Magno Quites Machado Filho <tuliom@linux.vnet.ibm.com>
	Thu, 17 Dec 2015 19:31:21 +0000 (17:31 -0200)
committer	Tulio Magno Quites Machado Filho <tuliom@linux.vnet.ibm.com>
	Thu, 17 Dec 2015 19:31:21 +0000 (17:31 -0200)
		1	2
ChangeLog	patch \|	diff1 \|	diff2 \|	blob \| history
sysdeps/unix/sysv/linux/powerpc/elision-lock.c	patch \|	diff1 \|	diff2 \|	blob \| history