Merge branch 'for-linus' of master.kernel.org:/pub/scm/linux/kernel/git/scjody/ieee1394

Browse source

...

This commit is contained in:

Linus Torvalds 2005-12-18 16:31:56 -08:00

parent 27f4e08347 16e842a62a

commit 23cb3ada1b

2 changed files with 58 additions and 10 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

1

drivers/ieee1394/hosts.h

View file

67

drivers/ieee1394/nodemgr.c

View file