Merge branch 'x86/core' into x86/x2apic
[linux-2.6] / fs / adfs / map.c
2005-04-16  Linus TorvaldsLinux-2.6.12-rc2 v2.6.12-rc2