Merge remote-tracking branch 'v4l-dvb/master'
authorStephen Rothwell <sfr@canb.auug.org.au>
Mon, 30 May 2011 01:50:16 +0000 (11:50 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Mon, 30 May 2011 01:50:16 +0000 (11:50 +1000)

Trivial merge