diff options
| author |   Ingo Molnar <mingo@kernel.org> | 2013-10-09 12:36:13 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2013-10-09 12:36:13 +0200 |
| commit | 37bf06375c90a42fe07b9bebdb07bc316ae5a0ce (patch) | |
| tree | de572dd6d3955b0725001776a7b03796f99e1e8e /Documentation/sysctl | |
| parent | sched/rt: Remove redundant nr_cpus_allowed test (diff) | |
| parent | Linux 3.12-rc4 (diff) | |
| download | linux-dev-37bf06375c90a42fe07b9bebdb07bc316ae5a0ce.tar.xz linux-dev-37bf06375c90a42fe07b9bebdb07bc316ae5a0ce.zip | |
Merge tag 'v3.12-rc4' into sched/core
Merge Linux v3.12-rc4 to fix a conflict and also to refresh the tree
before applying more scheduler patches.
Conflicts:
arch/avr32/include/asm/Kbuild
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'Documentation/sysctl')
0 files changed, 0 insertions, 0 deletions