David S. Miller 7e452baf6b Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6 ... Conflicts: drivers/message/fusion/mptlan.c drivers/net/sfc/ethtool.c net/mac80211/debugfs_sta.c		2008-11-11 15:43:02 -08:00
..
common	V4L/DVB (9330): Get rid of inode parameter at v4l_compat_translate_ioctl()	2008-10-21 14:31:45 -02:00
dvb	Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6	2008-11-11 15:43:02 -08:00
radio	V4L/DVB (9482): Documentation, especially regarding audio and informational links	2008-11-11 08:11:24 -02:00
video	V4L/DVB (9516): cx18: Move DVB buffer transfer handling from irq handler to work_queue	2008-11-11 08:11:33 -02:00
Kconfig	V4L/DVB (8392): media/Kconfig: Convert V4L1_COMPAT select into "depends on"	2008-07-20 07:28:49 -03:00
Makefile	V4L/DVB (8274): sms1xxx: build cleanup after driver relocation	2008-07-20 07:20:56 -03:00