| commit | 37bf06375c90a42fe07b9bebdb07bc316ae5a0ce | [log] [tgz] |
|---|---|---|
| author | Ingo Molnar <mingo@kernel.org> | Wed Oct 09 12:36:13 2013 +0200 |
| committer | Ingo Molnar <mingo@kernel.org> | Wed Oct 09 12:36:13 2013 +0200 |
| tree | de572dd6d3955b0725001776a7b03796f99e1e8e | |
| parent | 6bfa687c19b7ab8adee03f0d43c197c2945dd869 [diff] | |
| parent | d0e639c9e06d44e713170031fe05fb60ebe680af [diff] |
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>