summaryrefslogtreecommitdiff
path: root/block/scsi_ioctl.c
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@g5.osdl.org>2006-11-13 08:27:17 -0800
committerLinus Torvalds <torvalds@g5.osdl.org>2006-11-13 08:27:17 -0800
commitbf2b3de2a8e66e5f554c2113fac688bcaaca77fb (patch)
treeff85fd274a45dea3557913047eb79e240eec5453 /block/scsi_ioctl.c
parent239fd45938f9ddf64f120e0260c7b76eb73bd5a7 (diff)
parent6f36fbb242442184d314e305199bb9a449be4f67 (diff)
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/mchehab/v4l-dvb
* 'master' of master.kernel.org:/pub/scm/linux/kernel/git/mchehab/v4l-dvb: V4L/DVB (4818): Flexcop-usb: fix debug printk V4L/DVB (4817): Fix uses of "&&" where "&" was intended V4L/DVB (4816): Change tuner type for Avermedia A16AR V4L/DVB (4815): Remote support for Avermedia A16AR V4L/DVB (4814): Remote support for Avermedia 777 V4L/DVB (4804): Fix missing i2c dependency for saa7110 V4L/DVB (4802): Cx88: fix remote control on WinFast 2000XP Expert V4L/DVB (4795): Tda826x: use correct max frequency
Diffstat (limited to 'block/scsi_ioctl.c')
0 files changed, 0 insertions, 0 deletions