projects / profile / ivi / kernel-x86-ivi.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 6bfa687 d0e639c)
Merge tag 'v3.12-rc4' into sched/core
authorIngo Molnar <mingo@kernel.org>
Wed, 9 Oct 2013 10:36:13 +0000 (12:36 +0200)
committerIngo Molnar <mingo@kernel.org>
Wed, 9 Oct 2013 10:36:13 +0000 (12:36 +0200)
commit37bf06375c90a42fe07b9bebdb07bc316ae5a0ce
treede572dd6d3955b0725001776a7b03796f99e1e8etree | snapshot
parent6bfa687c19b7ab8adee03f0d43c197c2945dd869commit | diff
parentd0e639c9e06d44e713170031fe05fb60ebe680afcommit | 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>
MAINTAINERS diff1 | diff2 | blob | history
arch/avr32/include/asm/Kbuild diff1 | diff2 | blob | history
arch/x86/kernel/entry_64.S diff1 | diff2 | blob | history
kernel/context_tracking.c diff1 | diff2 | blob | history
kernel/softirq.c diff1 | diff2 | blob | history
Domain: System / Uncategorized;