| commit | 9b4f2e9576658c4e52d95dc8d309f51b2e2db096 | [log] [tgz] |
|---|---|---|
| author | Stefan Richter <stefanr@s5r6.in-berlin.de> | Sun Sep 17 18:17:19 2006 +0200 |
| committer | Stefan Richter <stefanr@s5r6.in-berlin.de> | Sun Sep 17 18:19:31 2006 +0200 |
| tree | 7b1902b0f931783fccc6fee45c6f9c16b4fde5ce | |
| parent | 3c6c65f5ed5a6d307bd607aecd06d658c0934d88 [diff] | |
| parent | 803db244b9f71102e366fd689000c1417b9a7508 [diff] |
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>