aboutsummaryrefslogtreecommitdiff
path: root/drivers/media/video
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2009-02-02 19:23:49 -0800
committerLinus Torvalds <torvalds@linux-foundation.org>2009-02-02 19:23:49 -0800
commit017f51788ffdc16b0168143e38ea2c1f3551d983 (patch)
tree5ec33c9b638c4e86a1dcafd6528e8f6482549483 /drivers/media/video
parent17294ab2ca8e8c46f2e4825c55541b2b88e52bf4 (diff)
parentd224b6269e4731a82f648bb0281ea1a4d8b3311d (diff)
Merge git://git.kernel.org/pub/scm/linux/kernel/git/bart/ide-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/bart/ide-2.6: icside: fix PCB version 6 support (v2) tx4939ide: typo fix and minor cleanup ide: add CS5536 host driver (v3) ide: Force VIA IDE legacy interrupts for AmigaOne boards IDE: Unregister and disable devices if initialization fails. ide: fix ide_register_port() failure handling ide: struct device - replace bus_id with dev_name(), dev_set_name() ide-cd: fix DMA for non bio-backed requests
Diffstat (limited to 'drivers/media/video')
0 files changed, 0 insertions, 0 deletions