Sjur Brændeland 7fa8ad6df7 caif-hsi: Fix merge issues. ... Fix the failing merge in net-next by reverting the last net-next merge for caif_hsi.c and then merge in the commit: "caif-hsi: Bugfix - Piggyback'ed embedded CAIF frame lost" from the net repository. The commit:"caif-hsi: Add missing return in error path" from net repository was dropped, as it changed code previously removed in the net-next repository. Signed-off-by: Sjur Brændeland <sjur.brandeland@stericsson.com> Signed-off-by: David S. Miller <davem@davemloft.net>		2012-06-29 00:46:53 -07:00
..
Kconfig	caif: Add CAIF HSI Link layer driver	2011-06-01 21:15:38 -07:00
Makefile	caif: Add CAIF HSI Link layer driver	2011-06-01 21:15:38 -07:00
caif_hsi.c	caif-hsi: Fix merge issues.	2012-06-29 00:46:53 -07:00
caif_serial.c	module_param: make bool parameters really bool (net & drivers/net)	2011-12-19 22:27:29 -05:00
caif_shm_u5500.c	net: Remove unneeded version.h includes from drivers/net/	2011-06-24 02:40:08 -07:00
caif_shmcore.c	caif: include linux/io.h	2012-04-21 15:28:47 -04:00
caif_spi.c	simple_open: automatically convert to simple_open()	2012-04-05 15:25:50 -07:00
caif_spi_slave.c	net: Remove unneeded version.h includes from drivers/net/	2011-06-24 02:40:08 -07:00