]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 'v4l-dvb/master'
authorStephen Rothwell <sfr@canb.auug.org.au>
Thu, 21 Mar 2013 01:05:10 +0000 (12:05 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Thu, 21 Mar 2013 01:05:10 +0000 (12:05 +1100)
commit25c37ce3dd44a246dc76350712b6761e7468465d
treef2e97d205fc58078ea4fd257ff3621a8b8883190
parent7bcef3448176be6023be6a230ba9945a5d9ecc71
parentb9e7b1a8e702b3389e95aa2a33fe1bc228aa22a6
Merge remote-tracking branch 'v4l-dvb/master'

Conflicts:
drivers/media/platform/Kconfig
MAINTAINERS
drivers/media/platform/Kconfig