git.openpandora.org / pandora-kernel.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (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)
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>

Trivial merge
Pandora Kernel Repository