tree 7b1902b0f931783fccc6fee45c6f9c16b4fde5ce
parent 3c6c65f5ed5a6d307bd607aecd06d658c0934d88
parent 803db244b9f71102e366fd689000c1417b9a7508
author Stefan Richter <stefanr@s5r6.in-berlin.de> 1158509839 +0200
committer Stefan Richter <stefanr@s5r6.in-berlin.de> 1158509971 +0200

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>