c8d1a12692
Conflicts: drivers/staging/arlan/arlan-main.c drivers/staging/comedi/drivers/cb_das16_cs.c drivers/staging/cx25821/cx25821-alsa.c drivers/staging/dt3155/dt3155_drv.c drivers/staging/hv/hv.c drivers/staging/netwave/netwave_cs.c drivers/staging/wavelan/wavelan.c drivers/staging/wavelan/wavelan_cs.c drivers/staging/wlags49_h2/wl_cs.c This required a bit of hand merging due to the conflicts that happened in the later .34-rc releases, as well as some staging driver changing coming in through other trees (v4l and pcmcia). Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> |
||
---|---|---|
.. | ||
blkvsc.c | ||
blkvsc_drv.c | ||
channel.c | ||
channel.h | ||
channel_interface.c | ||
channel_interface.h | ||
channel_mgmt.c | ||
channel_mgmt.h | ||
connection.c | ||
hv.c | ||
hv.h | ||
hv_api.h | ||
hv_utils.c | ||
Kconfig | ||
logging.h | ||
Makefile | ||
netvsc.c | ||
netvsc.h | ||
netvsc_api.h | ||
netvsc_drv.c | ||
osd.c | ||
osd.h | ||
ring_buffer.c | ||
ring_buffer.h | ||
rndis.h | ||
rndis_filter.c | ||
rndis_filter.h | ||
storvsc.c | ||
storvsc_api.h | ||
storvsc_drv.c | ||
TODO | ||
utils.h | ||
version_info.h | ||
vmbus.c | ||
vmbus.h | ||
vmbus_api.h | ||
vmbus_channel_interface.h | ||
vmbus_drv.c | ||
vmbus_packet_format.h | ||
vmbus_private.h | ||
vstorage.h |