tree 25b2952cea42c4f792571b9e19c79d412fe53fe3
parent d0797b39dcd70fe366b114515cb898ac6fecdd99
parent 04b35abef779f5ed1ff5c039dffbbcc5d2c060b6
author Linus Torvalds <torvalds@woody.linux-foundation.org> 1187930334 -0700
committer Linus Torvalds <torvalds@woody.linux-foundation.org> 1187930334 -0700

Merge branch 'master' of ssh://master.kernel.org/pub/scm/linux/kernel/git/mchehab/v4l-dvb

* 'master' of ssh://master.kernel.org/pub/scm/linux/kernel/git/mchehab/v4l-dvb:
  V4L/DVB (6070): Fix a warning at dvb_net
  V4L/DVB (6042): b2c2-flexcop: fix Airstar HD5000 tuning regression