Merge branch 'master' into for_paulus
[linux-2.6] / drivers / ieee1394 / video1394.h
2005-04-16  Linus TorvaldsLinux-2.6.12-rc2 v2.6.12-rc2