]> git.baikalelectronics.ru Git - kernel.git/commit
projects / kernel.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 9d91d2e bc25b6c)
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)
commitd9b4fd16cfc5fec8a90f8eea9e186c7b1b0cde7b
treede572dd6d3955b0725001776a7b03796f99e1e8etree | snapshot
parent9d91d2ecba51909affa84bbb0c642aea2d18271ccommit | diff
parentbc25b6c102b413f911b5083264004c34f7e58e6ccommit | 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
Linux Kernel Source Tree.