arch/avr32/include/asm/Kbuild · 39cf275a1a18ba3c7eb9b986c5c9b35b57332798 · Kirill Smelkov / linux

You need to sign in or sign up before continuing.

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

Ingo Molnar authored Oct 09, 2013



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>

37bf0637

Kbuild 523 Bytes

Replace Kbuild