Merge branch 'rcu/fixes-for-v3.2' into rcu/urgent
authorPaul E. McKenney <paulmck@linux.vnet.ibm.com>
Mon, 16 Jan 2012 17:41:09 +0000 (09:41 -0800)
committerPaul E. McKenney <paulmck@linux.vnet.ibm.com>
Mon, 16 Jan 2012 17:41:18 +0000 (09:41 -0800)
commit51aa78271be9bf97df4ab19c3146e1f08e592c7e
treec09112e5c57178e20c29e8858a6d7c336cf8fb1c
parent805a6af8dba5dfdd35ec35dc52ec0122400b2610
parenta513f6bab0939800dcf1e7c075e733420cf967c5
Merge branch 'rcu/fixes-for-v3.2' into rcu/urgent

Merge reason: Add these commits so that fixes on this branch do not
conflict with already-mainlined code.

Signed-off-by: Paul E. McKenney <paulmck@linux.vnet.ibm.com>
kernel/events/core.c