Merge master.kernel.org:/pub/scm/linux/kernel/git/jejb/scsi-misc-2.6
[linux-2.6] / drivers / spi / spi_butterfly.c
2006-01-14  Linus TorvaldsMerge /pub/scm/linux/kernel/git/jejb/scsi-misc-2.6
2006-01-14  Linus TorvaldsMerge /pub/scm/linux/kernel/git/gregkh/spi-2.6
2006-01-14  David Brownell[PATCH] SPI: add spi_butterfly driver