mirror of
https://github.com/Evolution-X-Devices/kernel_google_b1c1
synced 2026-02-09 19:09:19 +00:00
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>