| author | Linus Torvalds <torvalds@linux-foundation.org> | |
| Fri, 13 Aug 2010 17:44:24 +0000 (10:44 -0700) | ||
| committer | Linus Torvalds <torvalds@linux-foundation.org> | |
| Fri, 13 Aug 2010 17:44:24 +0000 (10:44 -0700) | ||
| commit | 1547ac893acbf87738ded0b470e2735fdfba6947 | |
| tree | 26d0f08d2f198a45ec40b1f2a6f20eed1a7cb785 | tree | snapshot (tar.xz tar.gz zip) |
| parent | a30bfd6cd47f387e060fb06d2ba688a491e6eaec | commit | diff |
| parent | 2b80163c390b593bad313f64948993475bfd6069 | commit | diff |
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
* '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