Techwizz/kernel-fxtec-pro1x
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity
kernel-fxtec-pro1x/drivers/media/video/pvrusb2
History
David Howells 4c1ac1b491 Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6 
Conflicts:

	drivers/infiniband/core/iwcm.c
	drivers/net/chelsio/cxgb2.c
	drivers/net/wireless/bcm43xx/bcm43xx_main.c
	drivers/net/wireless/prism54/islpci_eth.c
	drivers/usb/core/hub.h
	drivers/usb/input/hid-core.c
	net/core/netpoll.c

Fix up merge failures with Linus's head and fix new compilation failures.

Signed-Off-By: David Howells <dhowells@redhat.com>
2006-12-05 14:37:56 +00:00
..
Kconfig V4L/DVB (4661): Pvrusb2: improve 24XXX config option description 2006-10-03 15:13:31 -03:00
Makefile V4L/DVB (4604): Fix broken pvrusb2 build 2006-09-26 12:30:35 -03:00
pvrusb2-audio.c V4L/DVB (4288): Clean out a zillion sparse warnings in pvrusb2 2006-06-30 15:59:50 -03:00
pvrusb2-audio.h V4L/DVB (4228a): pvrusb2 to kernel 2.6.18 2006-06-27 00:17:15 -03:00
pvrusb2-context.c WorkStruct: make allyesconfig 2006-11-22 14:57:56 +00:00
pvrusb2-context.h V4L/DVB (4228a): pvrusb2 to kernel 2.6.18 2006-06-27 00:17:15 -03:00
pvrusb2-ctrl.c V4L/DVB (4376): Make it possible for run-time calculation of control min/max in pvrusb2 2006-09-26 11:53:20 -03:00
pvrusb2-ctrl.h V4L/DVB (4240): Various V4L control enhancements in pvrusb2 2006-06-27 00:17:28 -03:00
pvrusb2-cx2584x-v4l.c V4L/DVB (4786): Pvrusb2: use NULL instead of 0 2006-11-02 23:58:08 -03:00
pvrusb2-cx2584x-v4l.h V4L/DVB (4228a): pvrusb2 to kernel 2.6.18 2006-06-27 00:17:15 -03:00
pvrusb2-debug.h V4L/DVB (4228a): pvrusb2 to kernel 2.6.18 2006-06-27 00:17:15 -03:00
pvrusb2-debugifc.c V4L/DVB (4288): Clean out a zillion sparse warnings in pvrusb2 2006-06-30 15:59:50 -03:00
pvrusb2-debugifc.h V4L/DVB (4228a): pvrusb2 to kernel 2.6.18 2006-06-27 00:17:15 -03:00
pvrusb2-eeprom.c V4L/DVB (4288): Clean out a zillion sparse warnings in pvrusb2 2006-06-30 15:59:50 -03:00
pvrusb2-eeprom.h V4L/DVB (4228a): pvrusb2 to kernel 2.6.18 2006-06-27 00:17:15 -03:00
pvrusb2-encoder.c V4L/DVB (4556): Fix a typo. 2006-09-26 12:30:34 -03:00
pvrusb2-encoder.h V4L/DVB (4228a): pvrusb2 to kernel 2.6.18 2006-06-27 00:17:15 -03:00
pvrusb2-hdw-internal.h V4L/DVB (4595): Remove CONFIG_VIDEO_PVRUSB2_24XXX from pvrusb2 driver 2006-09-26 12:30:35 -03:00
pvrusb2-hdw.c usb: pvrusb2-hdw free unlink urb cleanup 2006-12-01 14:23:32 -08:00
pvrusb2-hdw.h V4L/DVB (4662): Pvrusb2: Implement VIDIOC_INT_[G|S]_REGISTER 2006-10-03 15:13:34 -03:00
pvrusb2-i2c-chips-v4l2.c V4L/DVB (4674): Use NULL instead of 0 for ptrs 2006-10-03 15:14:20 -03:00
pvrusb2-i2c-cmd-v4l2.c V4L/DVB (4485): Fix a warning on PPC64 2006-09-26 12:30:31 -03:00
pvrusb2-i2c-cmd-v4l2.h V4L/DVB (4228a): pvrusb2 to kernel 2.6.18 2006-06-27 00:17:15 -03:00
pvrusb2-i2c-core.c V4L/DVB (4595): Remove CONFIG_VIDEO_PVRUSB2_24XXX from pvrusb2 driver 2006-09-26 12:30:35 -03:00
pvrusb2-i2c-core.h V4L/DVB (4287): Pvrusb2/: possible cleanups 2006-06-30 15:59:48 -03:00
pvrusb2-io.c usb: pvrusb2-io free urb cleanup 2006-12-01 14:23:32 -08:00
pvrusb2-io.h V4L/DVB (4337): Refine dead code elimination in pvrusb2 2006-07-29 17:22:24 -03:00
pvrusb2-ioread.c V4L/DVB (4337): Refine dead code elimination in pvrusb2 2006-07-29 17:22:24 -03:00
pvrusb2-ioread.h V4L/DVB (4287): Pvrusb2/: possible cleanups 2006-06-30 15:59:48 -03:00
pvrusb2-main.c V4L/DVB (4339): Removed the remaining config.h stuff 2006-09-26 09:03:16 -03:00
pvrusb2-std.c V4L/DVB (4288): Clean out a zillion sparse warnings in pvrusb2 2006-06-30 15:59:50 -03:00
pvrusb2-std.h V4L/DVB (4228a): pvrusb2 to kernel 2.6.18 2006-06-27 00:17:15 -03:00
pvrusb2-sysfs.c V4L/DVB (4594): Remove some dead data elements from pvrusb2 driver 2006-09-26 12:30:35 -03:00
pvrusb2-sysfs.h V4L/DVB (4228a): pvrusb2 to kernel 2.6.18 2006-06-27 00:17:15 -03:00
pvrusb2-tuner.c V4L/DVB (4288): Clean out a zillion sparse warnings in pvrusb2 2006-06-30 15:59:50 -03:00
pvrusb2-tuner.h V4L/DVB (4228a): pvrusb2 to kernel 2.6.18 2006-06-27 00:17:15 -03:00
pvrusb2-util.h V4L/DVB (4228a): pvrusb2 to kernel 2.6.18 2006-06-27 00:17:15 -03:00
pvrusb2-v4l2.c V4L/DVB (4786): Pvrusb2: use NULL instead of 0 2006-11-02 23:58:08 -03:00
pvrusb2-v4l2.h V4L/DVB (4228a): pvrusb2 to kernel 2.6.18 2006-06-27 00:17:15 -03:00
pvrusb2-video-v4l.c V4L/DVB (4288): Clean out a zillion sparse warnings in pvrusb2 2006-06-30 15:59:50 -03:00
pvrusb2-video-v4l.h V4L/DVB (4228a): pvrusb2 to kernel 2.6.18 2006-06-27 00:17:15 -03:00
pvrusb2-wm8775.c V4L/DVB (4288): Clean out a zillion sparse warnings in pvrusb2 2006-06-30 15:59:50 -03:00
pvrusb2-wm8775.h V4L/DVB (4228a): pvrusb2 to kernel 2.6.18 2006-06-27 00:17:15 -03:00
pvrusb2.h V4L/DVB (4228a): pvrusb2 to kernel 2.6.18 2006-06-27 00:17:15 -03:00