Merge branch 'for-linus' into for-next

Back-merge to prepare for applying more FireWire updates.