Merge ../linus
[sfrench/cifs-2.6.git] / drivers / ieee1394 / ieee1394_hotplug.h
2005-04-16 Linus TorvaldsLinux-2.6.12-rc2 v2.6.12-rc2