tree ad1eed03cbb83d8435cf92e82320f06fca1936b4
parent 1a18db94231ca3dd6d3af5ad9d0953e8f973d662
parent 14ffcff86dc36fad827ef8350d847daee56e63e4
author Paul E. McKenney <paulmck@linux.vnet.ibm.com> 1370231099 -0700
committer Paul E. McKenney <paulmck@linux.vnet.ibm.com> 1370231099 -0700

Merge commit '14ffcff86dc36fad827ef8350d847daee56e63e4' into HEAD

For -next testing.