Sascha Hauer e0f4fb2c98 Merge branch 'master' into next ... Conflicts: drivers/ata/disk_drive.c Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>		2011-11-29 20:45:23 +01:00
..
Kconfig	imx25: imx_spi: support CSPI v0.7 as found on i.MX25	2011-09-21 09:43:44 +02:00
Makefile	spi: add atmel-spi driver	2011-09-14 10:40:17 +02:00
altera_spi.c	spi/altera_spi: Add cs_change support	2011-11-25 12:38:34 +01:00
atmel_spi.c	atmel_spi: add mesg->actual_length, so devices can use it for read/write	2011-11-25 12:41:18 +01:00
atmel_spi.h	spi: add atmel-spi driver	2011-09-14 10:40:17 +02:00
imx_spi.c	introduce io.h	2011-09-22 19:03:05 +02:00
spi.c	spi: enfore default bits_per_word value	2011-09-29 12:27:32 +02:00