Merge commit '0d3c55bc9fd58393bd3bd9974991ec1f815e1326' into HEAD

Conflicts:
	include/linux/rcupdate.h