ieee1394: merge from Linus (9b4f2e95) · Commits · github.com / kvm-riscv / linux

Commit 9b4f2e95 authored Sep 17, 2006 by

Stefan Richter

ieee1394: merge from Linus



Conflicts: drivers/ieee1394/hosts.c
Patch "lockdep: annotate ieee1394 skb-queue-head locking" was meddling
with patch "ieee1394: fix kerneldoc of hpsb_alloc_host".

Signed-off-by: Stefan Richter <stefanr@s5r6.in-berlin.de>

parents 3c6c65f5 803db244

Hide whitespace changes

Inline Side-by-side

Some changes are not shown.

For a faster browsing experience, only 20 of 1000+ files are shown. Download one of the files below to see all changes.

Plain diff Email patch

Please register or to comment