forked from luck/tmp_suning_uos_patched
4c1ac1b491
Conflicts: drivers/infiniband/core/iwcm.c drivers/net/chelsio/cxgb2.c drivers/net/wireless/bcm43xx/bcm43xx_main.c drivers/net/wireless/prism54/islpci_eth.c drivers/usb/core/hub.h drivers/usb/input/hid-core.c net/core/netpoll.c Fix up merge failures with Linus's head and fix new compilation failures. Signed-Off-By: David Howells <dhowells@redhat.com> |
||
---|---|---|
.. | ||
Kconfig | ||
Makefile | ||
pxa2xx_spi.c | ||
spi_bitbang.c | ||
spi_butterfly.c | ||
spi_mpc83xx.c | ||
spi_s3c24xx_gpio.c | ||
spi_s3c24xx.c | ||
spi.c |