projects
/
GitHub
/
mt8127
/
android_kernel_alcatel_ttab.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
a30bfd6
2b80163
)
Merge branch 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab...
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)
* '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
Trivial merge