From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Fri, 13 Aug 2010 17:44:24 +0000 (-0700)
Subject: Merge branch 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab... 
X-Git-Tag: firefly_0821_release~9833^2~774
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=1547ac893acbf87738ded0b470e2735fdfba6947;p=firefly-linux-kernel-4.4.55.git

Merge branch 'v4l_for_linus' of git://git./linux/kernel/git/mchehab/linux-2.6

* 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-2.6:
  V4L/DVB: v4l2-ctrls.c: needs to include slab.h
  V4L/DVB: fix Kconfig to depends on VIDEO_IR
  V4L/DVB: Fix IR_CORE dependencies
---

1547ac893acbf87738ded0b470e2735fdfba6947