]> git.baikalelectronics.ru Git - kernel.git/commit
Merge branch 'linus' into cpus4096
authorIngo Molnar <mingo@elte.hu>
Mon, 28 Jul 2008 21:32:00 +0000 (23:32 +0200)
committerIngo Molnar <mingo@elte.hu>
Mon, 28 Jul 2008 21:32:00 +0000 (23:32 +0200)
commit820a84b35e58f94e9b7146c2e3ee04d391366246
tree99462000e6f0d4f907cb2fc690f19d4d441ba0f3
parent3daf842a76a7c4ba3d428f130f1685f91e4edd9e
parentb8a10764c0d7db53d9126f4aae1e15ff0181995c
Merge branch 'linus' into cpus4096

Conflicts:

kernel/stop_machine.c

Signed-off-by: Ingo Molnar <mingo@elte.hu>
kernel/cpu.c