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
..
74x164.h	…
Kbuild	…
ad7877.h	…
ad7879.h	…
ads7846.h	…
at73c213.h	…
at86rf230.h	drivers/ieee802154: add support for the at86rf230/231 transceivers	2012-06-26 21:06:11 -07:00
corgi_lcd.h	…
ds1305.h	…
eeprom.h	Support M95040 SPI EEPROM	2012-04-18 14:57:57 -07:00
flash.h	…
ifx_modem.h	…
l4f00242t03.h	…
libertas_spi.h	…
lms283gf05.h	…
max7301.h	…
mc33880.h	…
mcp23s08.h	…
mmc_spi.h	device.h: audit and cleanup users in main include dir	2012-03-16 10:38:24 -04:00
pxa2xx_spi.h	ARM: MMP: add pxa910-ssp into ssp_id_table	2012-06-11 12:25:50 +08:00
rspi.h	spi/rspi: add dmaengine support	2012-05-19 22:37:16 -06:00
s3c24xx.h	ARM: S3C24XX: move spi-s3c24xx platdata out of mach	2012-01-31 20:06:27 +09:00
sh_hspi.h	spi: sh-hspi: control spi clock more correctly	2012-03-15 03:41:01 -06:00
sh_msiof.h	…
spi.h	spi: fix spi.h kernel-doc warning	2012-04-27 11:03:38 -06:00
spi_bitbang.h	…
spi_gpio.h	…
spi_oc_tiny.h	…
spidev.h	…
tdo24m.h	…
tle62x0.h	…
tsc2005.h	…
xilinx_spi.h	…