drivers/firewire/core-iso.c · 902bca00dc6e3b3ff5fbb1e32e5dbb45d5f30579 · xcap / xcap-capability-linux

14 years ago

Merge firewire branches to be released post v2.6.35 · e78483c5

Stefan Richter authored 14 years ago


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 <stefanr@s5r6.in-berlin.de>

e78483c5

History

Merge firewire branches to be released post v2.6.35

Stefan Richter authored 14 years ago


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 <stefanr@s5r6.in-berlin.de>

core-iso.c 9.44 KiB