Merge reason: both topics modify the APIC code but were able to do it in
              parallel so far. An upcoming patch generates a conflict so
              merge them to avoid the conflict.
Signed-off-by: NIngo Molnar <mingo@elte.hu>