]> git.apps.os.sepia.ceph.com Git - ceph-client.git/commitdiff
projects / ceph-client.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 805a6af a513f6b)
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)
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>
1  2 
kernel/events/core.c patch | diff1 | diff2 | blob | history

diff --cc kernel/events/core.c
Simple merge
Unnamed repository; edit this file 'description' to name the repository.