linux_dsm_epyc7002/drivers/media/dvb/dvb-core
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
..
demux.h V4L/DVB (3413): Typos grab bag of the month 2006-03-08 12:04:24 -03:00
dmxdev.c V4L/DVB (3727): Remove DMX_GET_EVENT and associated data structures 2006-06-25 01:57:47 -03:00
dmxdev.h V4L/DVB (3501): Dmxdev: use dvb_ringbuffer 2006-03-21 08:53:29 -08:00
dvb_ca_en50221.c V4L/DVB (3984): Fix CI interface on KNC1 DVBT and DVBC cards 2006-06-25 02:00:06 -03:00
dvb_ca_en50221.h Linux-2.6.12-rc2 2005-04-16 15:20:36 -07:00
dvb_demux.c V4L/DVB (4149): Fix up funky logic in dvb 2006-06-25 02:05:13 -03:00
dvb_demux.h V4L/DVB (3318b): sem2mutex: drivers/media/, #2 2006-02-07 06:49:14 -02:00
dvb_filter.c V4L/DVB (3218): Whitespace cleanups 2006-01-09 15:25:34 -02:00
dvb_filter.h [PATCH] V4L/DVB: (3086c) Whitespaces cleanups part 3 2005-12-12 08:57:44 -08:00
dvb_frontend.c V4L/DVB (4832): Fix uninitialised variable in dvb_frontend_swzigzag 2006-11-26 08:52:37 -02:00
dvb_frontend.h V4L/DVB (4665): Add frontend structure callback for bus acquisition. 2006-10-03 15:13:46 -03:00
dvb_math.c V4L/DVB (3996): Make the table static 2006-06-25 02:00:11 -03:00
dvb_math.h V4L/DVB (3988): Add math routines required by DVB demods 2006-06-25 02:00:08 -03:00
dvb_net.c WorkStruct: make allyesconfig 2006-11-22 14:57:56 +00:00
dvb_net.h Linux-2.6.12-rc2 2005-04-16 15:20:36 -07:00
dvb_ringbuffer.c [PATCH] remove remaining errno and __KERNEL_SYSCALLS__ references 2006-10-02 07:57:23 -07:00
dvb_ringbuffer.h V4L/DVB (3484): Make dvb_ringbuffer compatible to dmxdev_buffer 2006-03-21 08:53:17 -08:00
dvbdev.c [PATCH] devfs: Remove devfs_remove() function from the kernel tree 2006-06-26 12:25:07 -07:00
dvbdev.h V4L/DVB (4391): Refactor dvb_detach calls into a single dvb_frontend_detach function. 2006-09-26 11:53:29 -03:00
Kconfig V4L/DVB (4732): Fix spelling error in Kconfig help text for DVB_CORE_ATTACH 2006-10-14 00:44:00 -03:00
Makefile V4L/DVB (4411): Fix minor errors in build files 2006-08-08 15:53:03 -03:00