tree 60d89cd0b5da5533d9f8be3864fd4bcad1cd3b0c
parent 87473fd5ea9359e4b5d1667a13dddeace488d903
parent 0d3c55bc9fd58393bd3bd9974991ec1f815e1326
author Paul E. McKenney <paulmck@linux.vnet.ibm.com> 1389676105 -0800
committer Paul E. McKenney <paulmck@linux.vnet.ibm.com> 1389676105 -0800

Merge commit '0d3c55bc9fd58393bd3bd9974991ec1f815e1326' into HEAD

Conflicts:
	include/linux/rcupdate.h