David S. Miller b26d344c6b Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ... Conflicts: drivers/net/caif/caif_hsi.c drivers/net/usb/qmi_wwan.c The qmi_wwan merge was trivial. The caif_hsi.c, on the other hand, was not. It's a conflict between 1c385f1fdf ("caif-hsi: Replace platform device with ops structure.") in the net-next tree and commit 39abbaef19 ("caif-hsi: Postpone init of HIS until open()") in the net tree. I did my best with that one and will ask Sjur to check it out. Signed-off-by: David S. Miller <davem@davemloft.net>		2012-06-28 17:37:00 -07:00
..
caif_hsi.c	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2012-06-28 17:37:00 -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_slave.c	net: Remove unneeded version.h includes from drivers/net/	2011-06-24 02:40:08 -07:00
caif_spi.c	simple_open: automatically convert to simple_open()	2012-04-05 15:25:50 -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