diff options
author | Paul E. McKenney <paulmck@linux.vnet.ibm.com> | 2012-01-16 09:41:09 -0800 |
---|---|---|
committer | Paul E. McKenney <paulmck@linux.vnet.ibm.com> | 2012-01-16 09:41:18 -0800 |
commit | 51aa78271be9bf97df4ab19c3146e1f08e592c7e (patch) | |
tree | c09112e5c57178e20c29e8858a6d7c336cf8fb1c /arch/x86/kernel/hpet.c | |
parent | 805a6af8dba5dfdd35ec35dc52ec0122400b2610 (diff) | |
parent | a513f6bab0939800dcf1e7c075e733420cf967c5 (diff) | |
download | blackbird-op-linux-51aa78271be9bf97df4ab19c3146e1f08e592c7e.tar.gz blackbird-op-linux-51aa78271be9bf97df4ab19c3146e1f08e592c7e.zip |
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>
Diffstat (limited to 'arch/x86/kernel/hpet.c')
0 files changed, 0 insertions, 0 deletions