ieee1394: merge from Linus