summaryrefslogtreecommitdiffstats
path: root/drivers/media
diff options
context:
space:
mode:
authorLinus Torvalds2006-04-01 07:36:51 +0200
committerLinus Torvalds2006-04-01 07:36:51 +0200
commit683aa4012f53b2ada0f430487e05d37b0d94e90a (patch)
tree93585c38ae43f9bcbf2d38c2c2e2dd86b049af30 /drivers/media
parentMerge master.kernel.org:/home/rmk/linux-2.6-mmc (diff)
parent[SERIAL] Allow 8250 PCI, PNP, GSC and HP300 support to be disabled (diff)
downloadkernel-qcow2-linux-683aa4012f53b2ada0f430487e05d37b0d94e90a.tar.gz
kernel-qcow2-linux-683aa4012f53b2ada0f430487e05d37b0d94e90a.tar.xz
kernel-qcow2-linux-683aa4012f53b2ada0f430487e05d37b0d94e90a.zip
Merge master.kernel.org:/home/rmk/linux-2.6-serial
* master.kernel.org:/home/rmk/linux-2.6-serial: [SERIAL] Allow 8250 PCI, PNP, GSC and HP300 support to be disabled
Diffstat (limited to 'drivers/media')
0 files changed, 0 insertions, 0 deletions