Stefan Richter e78483c5ae Merge firewire branches to be released post v2.6.35 ...

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>

2010-08-02 10:09:04 +02:00

42 KiB

Raw Blame History

View Raw