Merge branches 'release' and 'wmi-2.6.25' into release
[linux-2.6] / drivers / parisc / eisa_enumerator.c
2005-04-16  Linus TorvaldsLinux-2.6.12-rc2 v2.6.12-rc2