]> git.baikalelectronics.ru Git - kernel.git/commit
Merge branch 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab...
authorLinus Torvalds <torvalds@linux-foundation.org>
Fri, 13 Aug 2010 17:44:24 +0000 (10:44 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Fri, 13 Aug 2010 17:44:24 +0000 (10:44 -0700)
commit993e2a73b202dcffb1aa92dce143a91c02f9cb8c
tree26d0f08d2f198a45ec40b1f2a6f20eed1a7cb785
parent1f82f1454eabc0b45c3d2e9dfc50a8d584b678ed
parentbf6716d25b6c042f3b2d761aa41ae34dcd69cb62
Merge branch 'v4l_for_linus' of git://git.kernel.org/pub/scm/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