Merge branch 'x86/apic' into x86-v28-for-linus-phase4-B
[linux-2.6] / fs / ntfs / collate.c
2005-04-16  Linus TorvaldsLinux-2.6.12-rc2 v2.6.12-rc2