Commit 37bf0637 authored 11 years ago by Ingo Molnar

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>

parents 6bfa687c d0e639c9

No related branches found

No related tags found

Hide whitespace changes

Inline Side-by-side

Showing with 128 additions and 58 deletions

Please register or to comment

Admin message

Merge tag 'v3.12-rc4' into sched/core