]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
Merge remote-tracking branch 'v4l-dvb/master'
authorStephen Rothwell <sfr@canb.auug.org.au>
Thu, 19 Sep 2013 01:16:58 +0000 (11:16 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Thu, 19 Sep 2013 01:16:58 +0000 (11:16 +1000)
Conflicts:
drivers/media/platform/s5p-mfc/s5p_mfc_dec.c


Trivial merge