b26d344c6b
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
1c385f1fdf6f9c66d982802cd74349c040980b50 ("caif-hsi: Replace platform
device with ops structure.") in the net-next tree and commit
39abbaef19cd0a30be93794aa4773c779c3eb1f3 ("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>
|
||
|---|---|---|
| .. | ||
| 74x164.h | ||
| ad7877.h | ||
| ad7879.h | ||
| ads7846.h | ||
| at73c213.h | ||
| at86rf230.h | ||
| corgi_lcd.h | ||
| ds1305.h | ||
| eeprom.h | ||
| flash.h | ||
| ifx_modem.h | ||
| Kbuild | ||
| l4f00242t03.h | ||
| libertas_spi.h | ||
| lms283gf05.h | ||
| max7301.h | ||
| mc33880.h | ||
| mcp23s08.h | ||
| mmc_spi.h | ||
| pxa2xx_spi.h | ||
| rspi.h | ||
| s3c24xx.h | ||
| sh_hspi.h | ||
| sh_msiof.h | ||
| spi_bitbang.h | ||
| spi_gpio.h | ||
| spi_oc_tiny.h | ||
| spi.h | ||
| spidev.h | ||
| tdo24m.h | ||
| tle62x0.h | ||
| tsc2005.h | ||
| xilinx_spi.h | ||