Automatic merge of rsync://rsync.kernel.org/pub/scm/linux/kernel/git/jgarzik/libata...
[linux-2.6] / drivers / media / dvb / b2c2 / flexcop-dma.c
2005-05-17  Linus TorvaldsMerge ... /linux/kernel/git/jgarzik/libata-2.6.git
2005-05-17  Linus TorvaldsMerge ... /linux/kernel/git/gregkh/usb-2.6.git/
2005-05-17  Johannes Stezenbach[PATCH] dvb: b2c2/flexcop driver refactoring part 2...