Android SDK / linux-imx / d02e30c31c5 - PHYTEC BitBucket (Stash)

Commits

H. Peter Anvin committed d02e30c31c5M22 Feb 2010

Merge branch 'x86/irq' into x86/apic

Merge reason:
	Conflicts in arch/x86/kernel/apic/io_apic.c

Resolved Conflicts:
	arch/x86/kernel/apic/io_apic.c

Signed-off-by: H. Peter Anvin <hpa@zytor.com>

Showing diff to0fdc7a8022c