summaryrefslogtreecommitdiff
path: root/drivers/ide/ide.c
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@g5.osdl.org>2006-06-26 10:54:02 -0700
committerLinus Torvalds <torvalds@g5.osdl.org>2006-06-26 10:54:02 -0700
commit5f2f444136abdb13dbd2094555aa65fc252aef6c (patch)
treeeb7ff532050c76319ba9d0c190a19f10a101e844 /drivers/ide/ide.c
parent81a07d7588d376c530d006e24d7981304ce96e16 (diff)
parent33f40b3b023b9f00b40ecfb3a39286de13516b33 (diff)
Merge master.kernel.org:/pub/scm/linux/kernel/git/mchehab/v4l-dvb
* master.kernel.org:/pub/scm/linux/kernel/git/mchehab/v4l-dvb: V4L/DVB (4227): Update this driver for recent header file movement. V4L/DVB (4223): Add V4L2_CID_MPEG_STREAM_VBI_FMT control V4L/DVB (4222): Always switch tuner mode when calling VIDIOC_S_FREQUENCY. V4L/DVB (4221): Add HM12 YUV format define. V4L/DVB (4219): Av7110: analog sound output of DVB-C rev 2.3 V4L/DVB (4217): Fix a misplaced closing bracket/else, which caused swzigzag not to be called V4L/DVB (4215): Make VIDEO_CX88_BLACKBIRD a separate build option V4L/DVB (4214): Make VIDEO_CX2341X a selectable build option V4L/DVB (4213): Cx88: cleanups V4L/DVB (4211): Fix an Oops for all fe that have get_frontend_algo == NULL
Diffstat (limited to 'drivers/ide/ide.c')
0 files changed, 0 insertions, 0 deletions