From: Stefan Richter <stefanr@s5r6.in-berlin.de>
Date: Sun, 17 Sep 2006 16:17:19 +0000 (+0200)
Subject: ieee1394: merge from Linus
X-Git-Tag: v2.6.19-rc1~644^2~31
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9b4f2e9576658c4e52d95dc8d309f51b2e2db096;p=pandora-kernel.git

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>
---

9b4f2e9576658c4e52d95dc8d309f51b2e2db096
Reading git-diff-tree failed