tree 90bd50cd9cde3eb5e514a9c2e40b33c1845bc361
parent c6234330e27e622cf90b92ac60e199d232e4c42f
parent e8b6d346a170fb35e9bac688c4b810763c74e805
author Paul E. McKenney <paulmck@linux.vnet.ibm.com> 1343060366 -0700
committer Paul E. McKenney <paulmck@linux.vnet.ibm.com> 1343060366 -0700

Merge branch 'dev.3.7.2012.07.23a' into HEAD

Conflicts:
	kernel/rcutree.h
	kernel/rcutree_plugin.h
	kernel/watchdog.c