mirror of
https://github.com/torvalds/linux.git
synced 2026-10-07 05:31:08 -04:00
Conflicts: drivers/firewire/core-card.c drivers/firewire/core-cdev.c and forgotten #include <linux/time.h> in drivers/firewire/ohci.c Signed-off-by: Stefan Richter <[email protected]>