diff options
| author | Greg Kroah-Hartman | 2013-06-18 01:57:20 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman | 2013-06-18 01:57:20 +0200 |
| commit | bb07b00be77fb33274cb44a03bdbf2471e556189 (patch) | |
| tree | 620390077de843dd7626998f0d8441d14a6c66d9 /init | |
| parent | kobject: sanitize argument for format string (diff) | |
| parent | Linux 3.10-rc6 (diff) | |
| download | kernel-qcow2-linux-bb07b00be77fb33274cb44a03bdbf2471e556189.tar.gz kernel-qcow2-linux-bb07b00be77fb33274cb44a03bdbf2471e556189.tar.xz kernel-qcow2-linux-bb07b00be77fb33274cb44a03bdbf2471e556189.zip | |
Merge 3.10-rc6 into driver-core-next
We want these fixes here too.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'init')
| -rw-r--r-- | init/Kconfig | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/init/Kconfig b/init/Kconfig index a5e0917165fe..55ccdf6640ff 100644 --- a/init/Kconfig +++ b/init/Kconfig @@ -431,6 +431,7 @@ choice config TREE_RCU bool "Tree-based hierarchical RCU" depends on !PREEMPT && SMP + select IRQ_WORK help This option selects the RCU implementation that is designed for very large SMP system with hundreds or |