Jiri Kosina 6396fc3b3f Merge branch 'master' into for-next ... Conflicts: fs/exofs/inode.c		2010-08-11 09:36:51 +02:00
..
common	V4L/DVB: V4L: do not autoselect components on embedded systems	2010-08-08 23:43:02 -03:00
dvb	V4L/DVB: dvb: siano: free spinlock before schedule()	2010-08-08 23:43:06 -03:00
IR	V4L/DVB: media: ir-keytable: null dereference in debug code	2010-08-08 23:43:06 -03:00
radio	V4L/DVB: si470x: -EINVAL overwritten in si470x_vidioc_s_tuner()	2010-08-02 16:42:44 -03:00
video	Merge branch 'master' into for-next	2010-08-11 09:36:51 +02: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