]> git.kernelconcepts.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 'v4l-dvb/master'
authorStephen Rothwell <sfr@canb.auug.org.au>
Mon, 19 Dec 2011 01:45:39 +0000 (12:45 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Mon, 19 Dec 2011 01:45:39 +0000 (12:45 +1100)
commit3ceee78c2de7f1e77236c27eb0368b8677c8f2cc
tree6d1ade549c1e1b377a3e2f4c7bb1fea56321d6db
parent794472121ab0d924a9e4e6f0ece9a43de8e4e9a0
parent6dd938014cb771c92d10518b9ea8239adb8ff6ad
Merge remote-tracking branch 'v4l-dvb/master'

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