diff options
| author | Paul E. McKenney <paulmck@linux.vnet.ibm.com> | 2012-09-25 13:01:45 -0400 |
|---|---|---|
| committer | Paul E. McKenney <paulmck@linux.vnet.ibm.com> | 2012-09-25 13:01:45 -0400 |
| commit | 5217192b85480353aeeb395574e60d0db04f3676 (patch) | |
| tree | a45b440623a8fc55ece18b72e40829b2d9815d74 /block/ioctl.c | |
| parent | bda4ec9f6a7d7b249c7b14baa553731efedce300 (diff) | |
| parent | bff4a394795add6b919debc009f72b7607f5d4bf (diff) | |
Merge remote-tracking branch 'tip/smp/hotplug' into next.2012.09.25b
The conflicts between kernel/rcutree.h and kernel/rcutree_plugin.h
were due to adjacent insertions and deletions, which were resolved
by simply accepting the changes on both branches.
Diffstat (limited to 'block/ioctl.c')
0 files changed, 0 insertions, 0 deletions