commit | 89a30a8388c9592579f237bc06988808f2c454d4 | [log] [tgz] |
---|---|---|
author | Linus Torvalds <torvalds@woody.linux-foundation.org> | Mon Jan 07 13:29:39 2008 -0800 |
committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | Mon Jan 07 13:29:39 2008 -0800 |
tree | 8273743377e8cde5f4f3beee7e9535d966b04abc | |
parent | 2b300d204738a70fa62c38583905a6989b3cedcd [diff] | |
parent | 89dab3573aa1d95fd222ee4551f964bfa4c16823 [diff] |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/v4l-dvb * git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/v4l-dvb: V4L/DVB (6916): ivtv: udelay has to be changed *after* the eeprom was read, not before V4L/DVB (6944a): Fix Regression VIDIOCGMBUF ioctl hangs on bttv driver