projects / linux-2.6 / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 3c6c65f 803db24)
ieee1394: merge from Linus
authorStefan Richter <stefanr@s5r6.in-berlin.de>
Sun, 17 Sep 2006 16:17:19 +0000 (18:17 +0200)
committerStefan Richter <stefanr@s5r6.in-berlin.de>
Sun, 17 Sep 2006 16:19:31 +0000 (18:19 +0200)
commit9b4f2e9576658c4e52d95dc8d309f51b2e2db096
tree7b1902b0f931783fccc6fee45c6f9c16b4fde5cetree | snapshot
parent3c6c65f5ed5a6d307bd607aecd06d658c0934d88commit | diff
parent803db244b9f71102e366fd689000c1417b9a7508commit | 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>
drivers/ieee1394/hosts.c diff1 | diff2 | blob | history
drivers/ieee1394/ohci1394.c diff1 | diff2 | blob | history
Making Linux better for my computers