]> www.infradead.org Git - nvme.git/commitdiff
projects / nvme.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 34b8c39 db9edfd)
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)
1  2 
drivers/ieee1394/nodemgr.c patch | diff1 | diff2 | blob | history

diff --cc drivers/ieee1394/nodemgr.c
Simple merge
Unnamed repository; edit this file 'description' to name the repository.