Merge with http://kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git
authorJody McIntyre <scjody@modernduck.com>
Thu, 5 Jan 2006 13:03:40 +0000 (08:03 -0500)
committerJody McIntyre <scjody@modernduck.com>
Thu, 5 Jan 2006 13:03:40 +0000 (08:03 -0500)
commit0a75c23a009ff65f651532cecc16675d05f4de37
treebdcd6158758fe1810f0ddddb80d2816779518688
parent34b8c399dc04c8e51f014b73458e654570698597
parentdb9edfd7e339ca4113153d887e782dd05be5a9eb
Merge ... /linux/kernel/git/torvalds/linux-2.6.git
drivers/ieee1394/nodemgr.c