When a merge does not work automatically, git prevents
[linux-2.6] / drivers / acpi / pci_bind.c
2005-04-16  Linus TorvaldsLinux-2.6.12-rc2 v2.6.12-rc2