Skip to content
Commit e78483c5 authored by Stefan Richter's avatar Stefan Richter
Browse files

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: default avatarStefan Richter <stefanr@s5r6.in-berlin.de>
parents 9fe6206f b20d02e3 20802224
Expand all Hide whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment