David S. Miller aa2ba5f108 Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6 ... Conflicts: drivers/net/ixgbe/ixgbe_main.c drivers/net/smc91x.c		2008-12-02 19:50:27 -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-12-02 19:50:27 -08:00
radio	V4L/DVB (9482): Documentation, especially regarding audio and informational links	2008-11-11 08:11:24 -02:00
video	em28xx: remove backward compat macro added on a previous fix	2008-12-01 18:04:14 -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