diff options
| author |   Linus Torvalds <torvalds@linux-foundation.org> | 2010-08-13 10:44:24 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-08-13 10:44:24 -0700 |
| commit | 1547ac893acbf87738ded0b470e2735fdfba6947 (patch) | |
| tree | 26d0f08d2f198a45ec40b1f2a6f20eed1a7cb785 /drivers/s390 | |
| parent | Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/jlbec/ocfs2 (diff) | |
| parent | V4L/DVB: v4l2-ctrls.c: needs to include slab.h (diff) | |
| download | linux-dev-1547ac893acbf87738ded0b470e2735fdfba6947.tar.xz linux-dev-1547ac893acbf87738ded0b470e2735fdfba6947.zip | |
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
Diffstat (limited to 'drivers/s390')
0 files changed, 0 insertions, 0 deletions