| commit | ec97d8cc8d0063d5ab3ab2db225b844b62f440cd | [log] [tgz] |
|---|---|---|
| author | Paul E. McKenney <paulmck@linux.vnet.ibm.com> | Tue Oct 23 15:13:49 2012 -0700 |
| committer | Paul E. McKenney <paulmck@linux.vnet.ibm.com> | Tue Oct 23 15:13:49 2012 -0700 |
| tree | 47b4ad9ac92515440c0b4a02f48a64b84bd9a2c5 | |
| parent | 38be7d35ad5d465b8f5fb8aa63274f50fb3f2d14 [diff] | |
| parent | 340f588bbaed6cb518aa65e7a330dcc3fff911f8 [diff] |
Merge branch 'idle.2012.10.23c' into dev.3.8.2012.10.23d Resolved adjacent-change conflicts for: kernel/rcu.h kernel/rcutree.c