Merge by hand (conflicts between pending drivers and kfree cleanups)
[pandora-kernel.git] / include / asm-um / apic.h
2005-04-16 Linus TorvaldsLinux-2.6.12-rc2 v2.6.12-rc2