summaryrefslogtreecommitdiffstats
path: root/COPYING
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@g5.osdl.org>2006-10-08 21:28:41 +0200
committerLinus Torvalds <torvalds@g5.osdl.org>2006-10-08 21:28:41 +0200
commit7ff3e52cf2947ebd38c84159af68e5a29d228f6c (patch)
tree17f1a54b368554b722c18c28852ded0f90856865 /COPYING
parentMerge branch 'irq-fixes' of git://git.parisc-linux.org/git/linux-2.6 (diff)
parentieee1394: nodemgr: fix startup of knodemgrd (diff)
downloadlinux-7ff3e52cf2947ebd38c84159af68e5a29d228f6c.tar.xz
linux-7ff3e52cf2947ebd38c84159af68e5a29d228f6c.zip
Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394/linux1394-2.6
* 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394/linux1394-2.6: ieee1394: nodemgr: fix startup of knodemgrd
Diffstat (limited to 'COPYING')
0 files changed, 0 insertions, 0 deletions