aboutsummaryrefslogtreecommitdiff
path: root/drivers/ide/pci
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@woody.linux-foundation.org>2007-12-25 20:18:25 -0800
committerLinus Torvalds <torvalds@woody.linux-foundation.org>2007-12-25 20:18:25 -0800
commitc2f68ad3b59d7015bf6fb0037ee0b5f2331aed28 (patch)
tree27ba17750761072a649204ae43c7965f7b08e3d7 /drivers/ide/pci
parent00684418707c7a1e36ebdedc4b30fbba5d5860b1 (diff)
parentc3c4c839336767da2d0c18e8e9bab33bef64ef8d (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 (6876): ivtv: mspx4xx needs a longer i2c udelay V4L/DVB (6871): Kconfig: VIDEO_CX23885 must select DVB_LGDT330X
Diffstat (limited to 'drivers/ide/pci')
0 files changed, 0 insertions, 0 deletions