]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 'v4l-dvb/master'
authorStephen Rothwell <sfr@canb.auug.org.au>
Wed, 25 Jul 2012 00:14:02 +0000 (10:14 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Wed, 25 Jul 2012 00:14:07 +0000 (10:14 +1000)
commit72290830573f4499d0c29d83f245a8f25e88125e
tree89f940a20461c803965e053b178c0271c8f10172
parentcb92f7d203c892be6df2b53216a10b66c0b74d16
parent07c4a1e5073efffbc3205ae3fc9d3388ea11dc1a
Merge remote-tracking branch 'v4l-dvb/master'

Conflicts:
Documentation/feature-removal-schedule.txt
Documentation/feature-removal-schedule.txt
MAINTAINERS
drivers/i2c/i2c-core.c
drivers/media/video/v4l2-dev.c
drivers/media/video/v4l2-ioctl.c
include/linux/Kbuild
include/linux/i2c.h