summaryrefslogtreecommitdiffstats
path: root/COPYING
diff options
context:
space:
mode:
authorMauro Carvalho Chehab <mchehab@infradead.org>2006-01-16 11:39:30 +0100
committerMauro Carvalho Chehab <mchehab@infradead.org>2006-01-16 11:39:30 +0100
commitf87d09be8c2c270b83c2ad80d06206a7306e2fa9 (patch)
treed6e3f7e8ac8a6c567d800fb30e237eb788ac3edf /COPYING
parentMerge git://oss.sgi.com:8090/oss/git/xfs-2.6 (diff)
parentMerge branch 'work' (diff)
downloadlinux-f87d09be8c2c270b83c2ad80d06206a7306e2fa9.tar.xz
linux-f87d09be8c2c270b83c2ad80d06206a7306e2fa9.zip
Merge branch 'master' of ssh://master.kernel.org/pub/scm/linux/kernel/git/mchehab/v4l-dvb
Diffstat (limited to 'COPYING')
0 files changed, 0 insertions, 0 deletions