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
..
2010-07-20 16:25:41 -07:00
2010-07-01 09:39:48 +02:00
2010-07-20 16:25:41 -07:00
2010-07-19 13:17:37 -07:00
2010-06-01 12:04:35 -04:00
2010-07-26 08:05:31 -07:00