David Woodhouse e758936e02 Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6 ... Conflicts: include/asm-x86/statfs.h		2008-10-13 17:13:56 +01:00
..
common	V4L/DVB (8805): Steven Toth email address change	2008-09-03 18:37:21 -03:00
dvb	V4L/DVB (8877): b2c2 and bt8xx: udelay to mdelay	2008-09-04 18:27:03 -03:00
radio	V4L/DVB (8778): radio: fix incorrect video_register_device result check	2008-09-03 18:37:16 -03:00
video	Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6	2008-10-13 17:13:56 +01: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