]> 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, 14 Dec 2011 01:08:04 +0000 (12:08 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Wed, 14 Dec 2011 01:08:04 +0000 (12:08 +1100)
commit773d6d0e38620be86492516cce22a5b5dbb98fd4
treea29f63757deffb659e88e7d7ce477670bc3c9489
parente02ee428e5dadc94114ed6e23caefc0ba08ea654
parent6dd938014cb771c92d10518b9ea8239adb8ff6ad
Merge remote-tracking branch 'v4l-dvb/master'

Conflicts:
drivers/staging/media/as102/as102_drv.h
MAINTAINERS