diff options
author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-08-23 21:38:54 -0700 |
---|---|---|
committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-08-23 21:38:54 -0700 |
commit | 87bd1e9aaf067050bd88b3219b1582e8f67f7b87 (patch) | |
tree | 25b2952cea42c4f792571b9e19c79d412fe53fe3 /drivers/char/tty_io.c | |
parent | d0797b39dcd70fe366b114515cb898ac6fecdd99 (diff) | |
parent | 04b35abef779f5ed1ff5c039dffbbcc5d2c060b6 (diff) |
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
Diffstat (limited to 'drivers/char/tty_io.c')
0 files changed, 0 insertions, 0 deletions