Public Git Hosting - microdia.git/commit

summary | log | graphiclog1 | graphiclog2 | commit | commitdiff | tree | refs | edit | fork
(merge: 5e2b294 2fe2691)

commit	a29b106ac9aad9a6f7119d0dc3dbf68afe301674
author	Peter Nel <psnel@Xavier.(none)>
	Mon, 30 Jun 2008 14:51:42 +0000 (30 16:51 +0200)
committer	Peter Nel <psnel@Xavier.(none)>
	Mon, 30 Jun 2008 14:51:42 +0000 (30 16:51 +0200)
tree	99eeb36ee61758de73b7da78bacde8fe63c3969b	tree \| snapshot (tar.gz zip)
parent	5e2b2945f5067cd4c61c0e18a615c416bd69e245	commit \| diff
parent	2fe2691900697968b256df8285ffc84ca64abea5	commit \| diff

Merge branch 'master' of repo.or.cz/r/microdia.git

Conflicts:

microdia-usb.c

microdia-dev.c	diff1 \|	diff2 \|	blob \| history
microdia-usb.c	diff1 \|	diff2 \|	blob \| history

Microdia : webcam kernel driver, for USB webcams with vendor id 0c45