aboutsummaryrefslogtreecommitdiff
path: root/drivers/media
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@woody.linux-foundation.org>2007-06-20 17:11:44 -0700
committerLinus Torvalds <torvalds@woody.linux-foundation.org>2007-06-20 17:11:44 -0700
commitf1518a088bde6aea49e7c472ed6ab96178fcba3e (patch)
tree51d940efef6b7594a3152f4cdd65ae56ebae5f17 /drivers/media
parent2090dee420911045258d50239dc2c527e4b1dd06 (diff)
parent5fe675e2b3e41349deb0c81667065b9cb229ea1d (diff)
Merge branch 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/libata-dev
* 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/libata-dev: fix module_param mistake in it821x ahci: fix PORTS_IMPL override kerneldoc fix in libata libata: more NONCQ devices pata_it821x: (partially) fix DMA in RAID mode PATA: Add the MCP73/77 support to PATA driver
Diffstat (limited to 'drivers/media')
0 files changed, 0 insertions, 0 deletions