Jiri Kosina 4b7bd36470 Merge branch 'master' into for-next ... Conflicts: MAINTAINERS arch/arm/mach-omap2/pm24xx.c drivers/scsi/bfa/bfa_fcpim.c Needed to update to apply fixes for which the old branch was too outdated.		2010-12-22 18:57:02 +01:00
..
common	Merge branch 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-2.6	2010-12-20 10:35:04 -08:00
dvb	Merge branch 'rc-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild-2.6	2010-12-05 16:41:13 -08:00
IR	Input: ir-keytable - fix uninitialized variable warning	2010-10-31 21:05:43 -04:00
radio	Merge branch 'bkl_removal' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-2.6	2010-12-17 09:28:17 -08:00
video	Merge branch 'master' into for-next	2010-12-22 18:57:02 +01:00
Kconfig	[media] v4l: kill the BKL	2010-11-08 22:35:57 -02:00
Makefile	V4L/DVB (13612): IR: Move common IR code to drivers/media/IR	2009-12-16 00:18:42 -02:00