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

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

Mon, 22 Feb 2016 19:20:34 +0000 (16:20 -0300)

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

Mon, 22 Feb 2016 19:20:34 +0000 (16:20 -0300)
author Tulio Magno Quites Machado Filho <tuliom@linux.vnet.ibm.com>
Mon, 22 Feb 2016 19:20:34 +0000 (16:20 -0300)
committer Tulio Magno Quites Machado Filho <tuliom@linux.vnet.ibm.com>
Mon, 22 Feb 2016 19:20:34 +0000 (16:20 -0300)
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>
	Mon, 22 Feb 2016 19:20:34 +0000 (16:20 -0300)
committer	Tulio Magno Quites Machado Filho <tuliom@linux.vnet.ibm.com>
	Mon, 22 Feb 2016 19:20:34 +0000 (16:20 -0300)
		1	2
ChangeLog	patch \|	diff1 \|	diff2 \|	blob \| history
sysdeps/unix/sysv/linux/powerpc/elision-lock.c	patch \|	diff1 \|	diff2 \|	blob \| history