Merge branch 'master' of ssh://master.kernel.org/pub/scm/linux/kernel/git/mchehab...
authorLinus Torvalds <torvalds@woody.linux-foundation.org>
Fri, 24 Aug 2007 04:38:54 +0000 (21:38 -0700)
committerLinus Torvalds <torvalds@woody.linux-foundation.org>
Fri, 24 Aug 2007 04:38:54 +0000 (21:38 -0700)
commit87bd1e9aaf067050bd88b3219b1582e8f67f7b87
tree25b2952cea42c4f792571b9e19c79d412fe53fe3
parentd0797b39dcd70fe366b114515cb898ac6fecdd99
parent04b35abef779f5ed1ff5c039dffbbcc5d2c060b6
Merge branch 'master' of ssh:///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