Jiri Kosina 318ae2edc3 Merge branch 'for-next' into for-linus ... Conflicts: Documentation/filesystems/proc.txt arch/arm/mach-u300/include/mach/debug-macro.S drivers/net/qlge/qlge_ethtool.c drivers/net/qlge/qlge_main.c drivers/net/typhoon.c		2010-03-08 16:55:37 +01:00
..
common	V4L/DVB: tuner-types: Add Sony BTF-Pxn01Z tuner type used on GigaPocket cards	2010-02-26 15:11:07 -03:00
dvb	Merge branch 'for-next' into for-linus	2010-03-08 16:55:37 +01:00
IR	V4L/DVB: Kworld 315U remote support	2010-02-26 15:10:58 -03:00
radio	V4L/DVB: radio-si470x: Use UTF-8 encoding on a comment	2010-02-26 15:11:10 -03:00
video	Merge branch 'for-next' into for-linus	2010-03-08 16:55:37 +01:00
Kconfig	V4L/DVB (13612): IR: Move common IR code to drivers/media/IR	2009-12-16 00:18:42 -02:00
Makefile	V4L/DVB (13612): IR: Move common IR code to drivers/media/IR	2009-12-16 00:18:42 -02:00