aboutsummaryrefslogtreecommitdiffstats
path: root/arch/sparc/include/asm/idprom.h
diff options
context:
space:
mode:
authorIngo Molnar <mingo@elte.hu>2009-05-12 12:17:30 +0200
committerIngo Molnar <mingo@elte.hu>2009-05-12 12:17:36 +0200
commit6cda3eb62ef42aa5acd649bf99c8db544e0f4051 (patch)
tree93f74ca002f5756c8e157611174f9540b5cf41c0 /arch/sparc/include/asm/idprom.h
parentb9c61b70075c87a8612624736faf4a2de5b1ed30 (diff)
parentcec6be6d1069d697beb490bbb40a290d5ff554a2 (diff)
downloadkernel_samsung_tuna-6cda3eb62ef42aa5acd649bf99c8db544e0f4051.zip
kernel_samsung_tuna-6cda3eb62ef42aa5acd649bf99c8db544e0f4051.tar.gz
kernel_samsung_tuna-6cda3eb62ef42aa5acd649bf99c8db544e0f4051.tar.bz2
Merge branch 'x86/apic' into irq/numa
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: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'arch/sparc/include/asm/idprom.h')
0 files changed, 0 insertions, 0 deletions