Techwizz/kernel-fxtec-pro1x
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity
kernel-fxtec-pro1x/drivers/staging/hv
History
Greg Kroah-Hartman c8d1a12692 Merge staging-next tree into Linus's latest version 
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>
2010-05-21 12:48:55 -07:00
..
blkvsc.c Staging: hv: rename StorVsc.c to storvsc.c 2010-05-11 11:36:17 -07:00
blkvsc_drv.c Staging: hv: block_operations can be const 2010-05-11 14:15:34 -07:00
channel.c staging: hv: Fix error checking in channel.c 2010-05-14 13:57:56 -07:00
channel.h Staging: hv: rename ChannelMgmt.c and .h to channel_mgmt.c and .h 2010-05-11 11:36:17 -07:00
channel_interface.c Staging: hv: rename VmbusPrivate.h to vmbus_private.h 2010-05-11 11:36:17 -07:00
channel_interface.h Staging: hv: rename VmbusApi.h to vmbus_api.h 2010-05-11 11:36:17 -07:00
channel_mgmt.c staging: hv: Added heartbeat functionality to hv_utils 2010-05-17 16:32:30 -07:00
channel_mgmt.h Staging: hv: rename VmbusPacketFormat.h to vmbus_packet_format.h 2010-05-11 11:36:18 -07:00
connection.c Staging: hv: rename VmbusPrivate.h to vmbus_private.h 2010-05-11 11:36:17 -07:00
hv.c Staging: hv: rename VmbusPrivate.h to vmbus_private.h 2010-05-11 11:36:17 -07:00
hv.h
hv_api.h
hv_utils.c staging: hv: Added heartbeat functionality to hv_utils 2010-05-17 16:32:30 -07:00
Kconfig
logging.h
Makefile Staging: hv: rename ChannelInterface.c and .h to channel_interface.c and .h 2010-05-11 11:36:17 -07:00
netvsc.c Staging: hv: rename RndisFilter.c and .h to rndis_filter.c and .h 2010-05-11 11:36:17 -07:00
netvsc.h Staging: hv: rename VmbusPacketFormat.h to vmbus_packet_format.h 2010-05-11 11:36:18 -07:00
netvsc_api.h Staging: hv: rename VmbusApi.h to vmbus_api.h 2010-05-11 11:36:17 -07:00
netvsc_drv.c Merge staging-next tree into Linus's latest version 2010-05-21 12:48:55 -07:00
osd.c
osd.h
ring_buffer.c Staging: hv: rename RingBuffer.c and .h to ring_buffer.c and .h 2010-05-11 11:36:16 -07:00
ring_buffer.h Staging: hv: rename RingBuffer.c and .h to ring_buffer.c and .h 2010-05-11 11:36:16 -07:00
rndis.h
rndis_filter.c Merge staging-next tree into Linus's latest version 2010-05-21 12:48:55 -07:00
rndis_filter.h Staging: hv: rename RndisFilter.c and .h to rndis_filter.c and .h 2010-05-11 11:36:17 -07:00
storvsc.c Staging: hv: rename VmbusPacketFormat.h to vmbus_packet_format.h 2010-05-11 11:36:18 -07:00
storvsc_api.h Staging: hv: rename VmbusApi.h to vmbus_api.h 2010-05-11 11:36:17 -07:00
storvsc_drv.c Staging: hv: storvsc module descriptions 2010-05-11 14:15:34 -07:00
TODO
utils.h staging: hv: Added heartbeat functionality to hv_utils 2010-05-17 16:32:30 -07:00
version_info.h staging: hv: Added heartbeat functionality to hv_utils 2010-05-17 16:32:30 -07:00
vmbus.c Staging: Use kmemdup 2010-05-17 16:31:15 -07:00
vmbus.h Staging: hv: rename VmbusApi.h to vmbus_api.h 2010-05-11 11:36:17 -07:00
vmbus_api.h Staging: hv: rename VmbusApi.h to vmbus_api.h 2010-05-11 11:36:17 -07:00
vmbus_channel_interface.h Staging: hv: rename VmbusChannelInterface.h to vmbus_channel_interface.h 2010-05-11 11:36:17 -07:00
vmbus_drv.c Staging: hv: rename VersionInfo.h to version_info.h 2010-05-11 11:36:18 -07:00
vmbus_packet_format.h Staging: hv: rename VmbusPacketFormat.h to vmbus_packet_format.h 2010-05-11 11:36:18 -07:00
vmbus_private.h Staging: hv: rename VmbusPrivate.h to vmbus_private.h 2010-05-11 11:36:17 -07:00
vstorage.h