Russell King ed40d0c472 Merge branch 'origin' into devel ... Conflicts: sound/soc/pxa/pxa2xx-i2s.c		2009-03-28 20:29:51 +00:00
..
common	V4L/DVB (10527): tuner: fix TUV1236D analog/digital setup	2009-02-17 09:43:08 -03:00
dvb	DVB: firedtv: FireDTV S2 problems with tuning solved	2009-03-27 21:11:26 +01:00
radio	v4l: struct device - replace bus_id with dev_name(), dev_set_name()	2009-03-24 16:38:22 -07:00
video	Merge branch 'origin' into devel	2009-03-28 20:29:51 +00: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