]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 'v4l-dvb/master'
authorStephen Rothwell <sfr@canb.auug.org.au>
Mon, 12 Dec 2011 00:39:56 +0000 (11:39 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Mon, 12 Dec 2011 00:39:56 +0000 (11:39 +1100)
commit3a60b1f53a21a64a2824a02c14d27ebf9359ee92
tree457705c79dad840037f0a9a8edd52c056c54b45f
parent32e7bc33ae2a2f8e330972a9b96fce29b6ce0e8d
parent6dd938014cb771c92d10518b9ea8239adb8ff6ad
Merge remote-tracking branch 'v4l-dvb/master'

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