git.karo-electronics.de Git - karo-tx-linux.git/commit

]> git.karo-electronics.de Git - karo-tx-linux.git/commit

author	Stephen Rothwell <sfr@canb.auug.org.au>
	Thu, 3 Nov 2011 03:28:33 +0000 (14:28 +1100)
committer	Stephen Rothwell <sfr@canb.auug.org.au>
	Thu, 3 Nov 2011 03:28:33 +0000 (14:28 +1100)
commit	43180fa3ab295f935c1e3a7dfa19de6063801c33
tree	c16468e32b9ebd0ce709e0eb53d4543273d1d412	tree \| snapshot
parent	813a355a81e9358ecc311e6722f2f525c3adedb9	commit \| diff
parent	76ba028467efec92d61b002e1da41819129a4467	commit \| diff

Merge remote-tracking branch 'v4l-dvb/master'

Conflicts:
drivers/staging/Makefile

31 files changed:

drivers/media/video/Kconfig	diff1 \|	diff2 \|	blob \| history
drivers/media/video/cx25821/cx25821-alsa.c	diff1 \|	diff2 \|	blob \| history
drivers/media/video/cx25821/cx25821-audio-upstream.c	diff1 \|	diff2 \|	blob \| history
drivers/media/video/cx25821/cx25821-audio-upstream.h	diff1 \|	diff2 \|	blob \| history
drivers/media/video/cx25821/cx25821-audio.h	diff1 \|	diff2 \|	blob \| history
drivers/media/video/cx25821/cx25821-cards.c	diff1 \|	diff2 \|	blob \| history
drivers/media/video/cx25821/cx25821-core.c	diff1 \|	diff2 \|	blob \| history
drivers/media/video/cx25821/cx25821-gpio.c	diff1 \|	diff2 \|	blob \| history
drivers/media/video/cx25821/cx25821-i2c.c	diff1 \|	diff2 \|	blob \| history
drivers/media/video/cx25821/cx25821-video-upstream-ch2.c	diff1 \|	diff2 \|	blob \| history
drivers/media/video/cx25821/cx25821-video-upstream-ch2.h	diff1 \|	diff2 \|	blob \| history
drivers/media/video/cx25821/cx25821-video-upstream.c	diff1 \|	diff2 \|	blob \| history
drivers/media/video/cx25821/cx25821-video-upstream.h	diff1 \|	diff2 \|	blob \| history
drivers/media/video/cx25821/cx25821-video.c	diff1 \|	diff2 \|	blob \| history
drivers/media/video/cx25821/cx25821-video.h	diff1 \|	diff2 \|	blob \| history
drivers/media/video/cx25821/cx25821.h	diff1 \|	diff2 \|	blob \| history
drivers/staging/Kconfig	diff1 \|	diff2 \|	blob \| history
drivers/staging/Makefile	diff1 \|	diff2 \|	blob \| history
drivers/staging/media/cxd2099/Makefile	diff1 \|	diff2 \|	blob \| history
drivers/staging/media/dt3155v4l/dt3155v4l.c	diff1 \|	diff2 \|	blob \| history
drivers/staging/media/dt3155v4l/dt3155v4l.h	diff1 \|	diff2 \|	blob \| history
drivers/staging/media/easycap/easycap.h	diff1 \|	diff2 \|	blob \| history
drivers/staging/media/easycap/easycap_ioctl.c	diff1 \|	diff2 \|	blob \| history
drivers/staging/media/easycap/easycap_main.c	diff1 \|	diff2 \|	blob \| history
drivers/staging/media/easycap/easycap_sound.c	diff1 \|	diff2 \|	blob \| history
drivers/staging/media/go7007/Makefile	diff1 \|	diff2 \|	blob \| history
drivers/staging/media/go7007/wis-tw2804.c	diff1 \|	diff2 \|	blob \| history
drivers/staging/media/lirc/lirc_imon.c	diff1 \|	diff2 \|	blob \| history
drivers/staging/media/lirc/lirc_sasem.c	diff1 \|	diff2 \|	blob \| history
drivers/staging/media/lirc/lirc_serial.c	diff1 \|	diff2 \|	blob \| history
drivers/staging/media/lirc/lirc_sir.c	diff1 \|	diff2 \|	blob \| history

Linux kernel for KaRo TX COM modules

RSS Atom

drivers/media/video/Kconfig	diff1 \|	diff2 \|	blob \| history
drivers/media/video/cx25821/cx25821-alsa.c	diff1 \|	diff2 \|	blob \| history
drivers/media/video/cx25821/cx25821-audio-upstream.c	diff1 \|	diff2 \|	blob \| history
drivers/media/video/cx25821/cx25821-audio-upstream.h	diff1 \|	diff2 \|	blob \| history
drivers/media/video/cx25821/cx25821-audio.h	diff1 \|	diff2 \|	blob \| history
drivers/media/video/cx25821/cx25821-cards.c	diff1 \|	diff2 \|	blob \| history
drivers/media/video/cx25821/cx25821-core.c	diff1 \|	diff2 \|	blob \| history
drivers/media/video/cx25821/cx25821-gpio.c	diff1 \|	diff2 \|	blob \| history
drivers/media/video/cx25821/cx25821-i2c.c	diff1 \|	diff2 \|	blob \| history
drivers/media/video/cx25821/cx25821-video-upstream-ch2.c	diff1 \|	diff2 \|	blob \| history
drivers/media/video/cx25821/cx25821-video-upstream-ch2.h	diff1 \|	diff2 \|	blob \| history
drivers/media/video/cx25821/cx25821-video-upstream.c	diff1 \|	diff2 \|	blob \| history
drivers/media/video/cx25821/cx25821-video-upstream.h	diff1 \|	diff2 \|	blob \| history
drivers/media/video/cx25821/cx25821-video.c	diff1 \|	diff2 \|	blob \| history
drivers/media/video/cx25821/cx25821-video.h	diff1 \|	diff2 \|	blob \| history
drivers/media/video/cx25821/cx25821.h	diff1 \|	diff2 \|	blob \| history
drivers/staging/Kconfig	diff1 \|	diff2 \|	blob \| history
drivers/staging/Makefile	diff1 \|	diff2 \|	blob \| history
drivers/staging/media/cxd2099/Makefile	diff1 \|	diff2 \|	blob \| history
drivers/staging/media/dt3155v4l/dt3155v4l.c	diff1 \|	diff2 \|	blob \| history
drivers/staging/media/dt3155v4l/dt3155v4l.h	diff1 \|	diff2 \|	blob \| history
drivers/staging/media/easycap/easycap.h	diff1 \|	diff2 \|	blob \| history
drivers/staging/media/easycap/easycap_ioctl.c	diff1 \|	diff2 \|	blob \| history
drivers/staging/media/easycap/easycap_main.c	diff1 \|	diff2 \|	blob \| history
drivers/staging/media/easycap/easycap_sound.c	diff1 \|	diff2 \|	blob \| history
drivers/staging/media/go7007/Makefile	diff1 \|	diff2 \|	blob \| history
drivers/staging/media/go7007/wis-tw2804.c	diff1 \|	diff2 \|	blob \| history
drivers/staging/media/lirc/lirc_imon.c	diff1 \|	diff2 \|	blob \| history
drivers/staging/media/lirc/lirc_sasem.c	diff1 \|	diff2 \|	blob \| history
drivers/staging/media/lirc/lirc_serial.c	diff1 \|	diff2 \|	blob \| history
drivers/staging/media/lirc/lirc_sir.c	diff1 \|	diff2 \|	blob \| history