Merge firewire branches to be released post v2.6.35

Browse Source

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>

...

This commit is contained in:

Stefan Richter

2010-08-02 09:33:25 +02:00

parent 9fe6206f40 b20d02e37e 2080222429

commit e78483c5ae

31 changed files with 4308 additions and 576 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

715

drivers/firewire/ohci.c

File diff suppressed because it is too large Load Diff